Added large ammo ents #1044

Merged
merged 3 commits into from Aug 29, 2016

Projects

None yet

7 participants

@Kefta
Contributor
Kefta commented Aug 17, 2015

Also added ammo crate and dynamic resupply; for fooling around with and resupply based on needs

@Kefta Kefta Added large ammo ents
Also added ammo crate and dynamic resupply; for fooling around with and resupply based on needs
638e462
@bmwalters
Contributor

"Rocket Propelled Grenade Rocket"
good job?

@Kefta
Contributor
Kefta commented Aug 17, 2015

@zerfgog I thought that sounded wrong as well, however, that's what they actually call them in the U.S. military -- RPG rockets.

@thegrb93
Contributor

Yeah, everyone calls an rpg launcher an rpg just because it's shorter. so an rpg launcher rocket is an rpg rocket.

@robotboy655
Collaborator
+ADD_ITEM( "Ammo Crate",            "item_ammo_crate" )
+
+-- Dynamic materials; gives player what he needs most (health, shotgun ammo, suit energy, etc)
+ADD_ITEM( "Dynamic Supplies",      "item_dynamic_resupply" )

I don't think these two should be there, especially the ammo crate.

@Kefta
Contributor
Kefta commented Aug 19, 2015
@robotboy655
Collaborator

Once again, you changed the indentation with 1 tab = 8 spaces, while the rest of the code uses 1 tab = 4 spaces.

@BlackCetha

off-topic:
Regarding the name "RPG" i heard its actually a russian word they took the abbreviation from and then invented a name that fits that.

@robotboy655
Collaborator

In Russian it's called Grenade Launcher RPG-7 and the rockets are actually called Grenades for some reason ( Source: Russian Wikipedia ), the actual Russian abbreviation for RPG in English is Handheld Anti-Tank Grenade Launcher ( in Russian that is Ручной Противотанковый Гранатомёт )

The more you know.

@Kefta
Contributor
Kefta commented Mar 1, 2016

@robotboy655 Fixed

@mcNuggets1
Contributor

Should be merged.

@bmwalters bmwalters commented on the diff Jul 27, 2016
garrysmod/lua/autorun/game_hl2.lua
ADD_ITEM( "Crossbow Bolts", "item_ammo_crossbow" )
ADD_ITEM( "SMG Grenade", "item_ammo_smg1_grenade" )
-ADD_ITEM( "RPG", "item_rpg_round" )
+ADD_ITEM( "RPG Rocket", "item_rpg_round" )
@bmwalters
bmwalters Jul 27, 2016 edited Contributor

Perhaps spaces should be used for alignment here instead of tabs; as you can see in the GitHub editor (scroll up), some (most?) editors fail when tabs are used for alignment.

@Kefta
Contributor
Kefta commented Jul 27, 2016

Really, they shouldn't be aligned. It's kind of a dumb style imo; but if they are, tabs is the standard in most of the codebases as well as Source's codebase

@aStonedPenguin

8 space tabs? What kind of terrible person are you code_bs?

@robotboy655 robotboy655 merged commit 24db86d into garrynewman:master Aug 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment