Commit Graph
23028 Commits
Author SHA1 Message Date
Timothy Teakettle 311e149562 fix bloodpacks 2020-07-01 21:00:01 +01:00
LinandGitHub fa1e92d588 Merge pull request #12656 from Ghommie/Ghommie-cit826
Fixing two handed items and etcetera.
2020-07-01 14:30:16 -05:00
GhomandGitHub aaffe3ec12 Merge pull request #12647 from zeroisthebiggay/fuckfuckfuckfuck
attempts to port Wizard Gamemode now ends when all wizards and wizard apprentices are dead #47514
2020-07-01 19:46:16 +02:00
Ghommie f7de8034a1 Put an end to the null stack traces from icon2html's register_asset. 2020-07-01 19:26:09 +02:00
Ghommie 94f7dae62e Porting "Fix asset cache verification" and other tiny bits. 2020-07-01 16:24:12 +02:00
GhomandGitHub 8de00e80dd Update bag_of_holding.dm 2020-07-01 15:04:51 +02:00
kappa-samaandGitHub ad4f909d79 ashwalkers 2020-07-01 08:19:27 -04:00
kappa-samaandGitHub 3695595034 ammunition 2020-07-01 08:17:13 -04:00
kappa-samaandGitHub 73d616b3a4 more accurate 2020-07-01 08:13:30 -04:00
kappa-samaandGitHub 406af65d93 you need 5 of these 2020-07-01 08:12:35 -04:00
kappa-samaandGitHub 9cc6f5aa91 durathread->string 2020-07-01 08:09:43 -04:00
kappa-samaandGitHub 49af0d11c7 string 2020-07-01 08:09:39 -04:00
kappa-samaandGitHub 1fffd0a608 45 seconds lol 2020-07-01 08:02:41 -04:00
kappa-samaandGitHub 0b0d9ff1a6 this 2020-07-01 07:56:55 -04:00
kappa-samaandGitHub cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00
kappa-sama 1f38c3029c yeah ok 2020-07-01 07:40:43 -04:00
Letter N b35e3f2b93 fix: R&D Console, Vending, and chem master 2020-07-01 19:07:03 +08:00
YakumoChenandGitHub 8e25b90d54 removes obselete part 2020-07-01 09:08:01 +00:00
YakumoChenandGitHub 327a36f8bd removes obselete autolathe designs 2020-07-01 09:06:29 +00:00
YakumoChenandGitHub 67b5efbce0 Update pistol.dm 2020-07-01 09:03:48 +00:00
kappa-samaandGitHub e03112d1dc these 2020-07-01 04:59:59 -04:00
kappa-samaandGitHub 5c7c300bf0 these do nothing 2020-07-01 04:58:44 -04:00
YakumoChenandGitHub 346007b4fb Update beams.dm 2020-07-01 08:58:27 +00:00
YakumoChenandGitHub a3961a642c removes improv laser 2020-07-01 08:57:48 +00:00
YakumoChenandGitHub baf41d828a removes improv laser 2020-07-01 08:57:35 +00:00
YakumoChenandGitHub 550aa405e5 Update pistol.dm 2020-07-01 08:56:43 +00:00
YakumoChenandGitHub d9e5847b8f Update pistol.dm 2020-07-01 08:56:13 +00:00
YakumoChenandGitHub 6a48b9199f Update ammo_boxes.dm 2020-07-01 08:55:42 +00:00
YakumoChenandGitHub 6ec2cba2be Update laser.dm 2020-07-01 08:54:42 +00:00
YakumoChenandGitHub 36592431a9 Update pistol.dm 2020-07-01 08:53:54 +00:00
YakumoChenandGitHub ed017cc22a Update sheet_types.dm 2020-07-01 08:53:08 +00:00
YakumoChenandGitHub 4c460278b4 removes improv handgun spawns 2020-07-01 08:52:09 +00:00
YakumoChenandGitHub 6f50664189 removes improv handguns 2020-07-01 08:48:10 +00:00
YakumoChenandGitHub 35ee3e6aeb No pocket guns, unstupids part names 2020-07-01 08:43:34 +00:00
8f30d7f4d1 Update code/datums/components/storage/concrete/bag_of_holding.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-30 20:27:30 -07:00
timothyteakettle 0f0e0298e5 newline at end of file 2020-07-01 03:34:17 +01:00
timothyteakettle d1f92da74a 20 is fine if we edit volume 2020-07-01 03:29:22 +01:00
timothyteakettle 4865831b6e alright this is a bad meme 2020-07-01 03:28:37 +01:00
bunny232 afe9b2dfbd Update holy_weapons.dm 2020-06-30 11:15:40 -04:00
Ghommie cd1c5511a4 Fixing two handed items and etcetera. 2020-06-30 16:24:04 +02:00
silicons f03343b516 fix 2020-06-30 05:19:50 -07:00
silicons 2039496739 groan 2020-06-30 03:05:15 -07:00
siliconsandGitHub 837a77585c Update bag_of_holding.dm 2020-06-30 00:41:09 -07:00
silicons 9756431612 Spelling 2020-06-29 23:52:18 -07:00
silicons 7a2818d657 fix 2020-06-29 23:45:18 -07:00
silicons 6a91ce8416 fix 2020-06-29 23:43:53 -07:00
silicons ee34f37ac2 fix 2020-06-29 23:41:53 -07:00
silicons 3b3a3ad44e nayser 2020-06-29 23:37:51 -07:00
siliconsandGitHub 84f6efe683 Update shields.dm 2020-06-29 23:22:48 -07:00
siliconsandGitHub d22ab62b50 Update combat.dm 2020-06-29 23:20:52 -07:00