Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing. Merge branch 'srsbsns' Fucking finally figuring out how to make admins.txt be ignored. Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt stuff Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station latest setting for tgstation.dme deeply do I loathe these files Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt God I hate gitignore Merge branch 'master' of https://github.com/tgstation/-tg-station Modification of .gitignore to include admins.txt. Hopefully.` Added myself to admins.txt for testing. Merge branch 'srsbsns' Fucking finally figuring out how to make admins.txt be ignored. Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt stuff Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station latest setting for tgstation.dme deeply do I loathe these files Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt God I hate gitignore Merge branch 'master' of https://github.com/tgstation/-tg-station Modification of .gitignore to include admins.txt. Hopefully.` Added myself to admins.txt for testing. Merge branch 'srsbsns' Fucking finally figuring out how to make admins.txt be ignored. Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt stuff Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station Merge branch 'master' of https://github.com/tgstation/-tg-station latest setting for tgstation.dme deeply do I loathe these files Merge branch 'master' of https://github.com/tgstation/-tg-station Conflicts: config/admins.txt God I hate gitignore Merge branch 'master' of https://github.com/tgstation/-tg-station Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles Conflicts: config/admins.txt data/investigate/singulo.html I don't what I'm doing Massive overhaul to automatic gun functionality, intended primarily to allow partially-filled magazines to be released. Now it compiles and doesn't throw runtimes! Also chambering rounds works right! Unfortunately the contents still need to be looked at, the Russian Revolver isn't working, and the Bartender's shotgun is just a nightmare. Also you still can't eject mags. Mags eject, most gun work. Shotguns still have a problem with reloading and chambering. Russian Revolver is a bitch. Heavy finalizing touches. Fixed references to changed trees. Added icon_states for some magazines. Fixed revolver glitches and subtyped double-barreled shotguns to revolvers to fix its glitches. Made bullets and spent shells more obvious via graphical changes. Probably did some other things but I can't think of what they'd be. Sprite tweaks for final preparations for pull request. final FINAL finalizations. Adding full paths to overwritten procs for simplicity's sake. Fixing damaged .gitignore and config/admins.txt. Finalization for pull preparation. Clean up some descs, eliminate data folder.
2026-07-18 03:26:31 +01:00 · 2013-10-30 03:00:03 -07:00
parent a501cefb32
commit 19e51caef0
41 changed files with 846 additions and 620 deletions
@@ -692,7 +692,7 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/cloaking_device(M), slot_r_store)

 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile(M), slot_r_hand)
-			M.equip_to_slot_or_del(new /obj/item/ammo_magazine/a357(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_l_store)

 		if ("tournament chef") //Steven Seagal FTW
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chef(M), slot_w_uniform)
@@ -808,8 +808,8 @@ var/global/list/g_fancy_list_of_safe_types = null
 			for(var/i=3, i>0, i--)
 				sec_briefcase.contents += new /obj/item/weapon/spacecash/c1000
 			sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow
-			sec_briefcase.contents += new /obj/item/weapon/gun/projectile/mateba
-			sec_briefcase.contents += new /obj/item/ammo_magazine/a357
+			sec_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/mateba
+			sec_briefcase.contents += new /obj/item/ammo_box/a357
 			sec_briefcase.contents += new /obj/item/weapon/plastique
 			M.equip_to_slot_or_del(sec_briefcase, slot_l_hand)

@@ -844,7 +844,7 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack)

-			M.equip_to_slot_or_del(new /obj/item/ammo_magazine/a357(M), slot_in_backpack)
+			M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/device/flashlight(M), slot_in_backpack)
@@ -854,7 +854,7 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(M), slot_l_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/grenade/flashbang(M), slot_r_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(M), slot_s_store)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/mateba(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt)

 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(M), slot_r_hand)

@@ -910,9 +910,9 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask)
 			M.equip_to_slot_or_del(new /obj/item/clothing/head/centhat(M), slot_head)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/mateba(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(M), slot_r_store)
-			M.equip_to_slot_or_del(new /obj/item/ammo_magazine/a357(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_l_store)

 			var/obj/item/weapon/card/id/W = new(M)
 			W.name = "[M.real_name]'s ID Card (Centcom Commander)"
@@ -988,7 +988,7 @@ var/global/list/g_fancy_list_of_safe_types = null
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/hgpirate(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
-			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/mateba(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform)
 			var/obj/item/weapon/card/id/W = new(M)
 			W.name = "[M.real_name]'s ID Card (Admiral)"