Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync * sync part 1 - underscore folders in code * controllers folder * datums folder * game folder * cmon, work * modules - admin to awaymissions * cargo to events * fields to lighting * mapping > ruins * rest of the code folder * rest of the folders in the root directory * DME * fixes compiling errors. it compiles so it works * readds map changes * fixes dogborg module select * fixes typo in moduleselect_alternate_icon filepath
This commit is contained in:
@@ -17,6 +17,6 @@ GLOBAL_VAR_INIT(terrorism, FALSE)
|
||||
qdel(I)
|
||||
var/obj/item/gun/energy/laser/LaserAK/AK = new(src)
|
||||
if(!GLOB.terrorism)
|
||||
AK.admin_spawned = TRUE //To prevent announcing
|
||||
AK.flags_1 |= ADMIN_SPAWNED_1 //To prevent announcing
|
||||
put_in_hands(AK)
|
||||
AK.pickup(src) //For the stun shielding
|
||||
|
||||
Reference in New Issue
Block a user