Commit Graph

29060 Commits

Author SHA1 Message Date
timothyteakettle 440a6633ea Update preferences_savefile.dm 2021-05-07 00:37:33 +01:00
timothyteakettle e95e4ed106 Update preferences_savefile.dm 2021-05-06 23:39:41 +01:00
Putnam 6c8fa56132 Adds make priority announcement verb 2021-05-06 15:10:36 -07:00
Putnam 8d96de6b03 More tweaks, whoops 2021-05-06 14:52:17 -07:00
timothyteakettle b1f84f94db Update body_markings.dm 2021-05-06 22:43:31 +01:00
timothyteakettle 80599201cf better fix 2021-05-06 22:39:07 +01:00
timothyteakettle cb12843a34 bugfix 2021-05-06 22:35:15 +01:00
Putnam ecca9d788b More supernova tweaks 2021-05-06 14:32:13 -07:00
silicons cb1e2f3730 thing 2021-05-06 02:09:06 -07:00
silicons 97dcfd0750 Update effects_foam.dm 2021-05-06 02:02:25 -07:00
silicons 6ac964b35a e 2021-05-06 01:52:35 -07:00
SandPoot 6414b371f8 fancy description for the proc 2021-05-06 03:03:46 -03:00
SandPoot 6bd5707a63 found it 2021-05-06 02:50:32 -03:00
keronshb 7947258e51 Off balance disarm
If it hits a wall or a person while under the effect of off balance.
2021-05-05 23:57:01 -04:00
Timothy Teakettle a269e8bf03 migration fix 2021-05-06 01:51:17 +01:00
zerothebigboy 90930494d6 k 2021-05-05 18:43:11 -04:00
zerothebigboy c8ebe720ec k 2021-05-05 18:25:05 -04:00
Timothy Teakettle bee9d9c047 support for the ridiculous thing i just did 2021-05-05 22:29:21 +01:00
SandPoot 9cf04467a7 upload files 2021-05-05 17:55:30 -03:00
Timothy Teakettle d39a60dd6b casually list the matrixes for several hundred sprites 2021-05-05 21:24:07 +01:00
Artur 8a3dd8515e fixes bleeding properly 2021-05-05 21:42:14 +03:00
Artur e5646404d7 Fixes virus bottles being white 2021-05-05 21:34:53 +03:00
Artur cc59e2c225 feedback changes 2021-05-05 20:40:52 +03:00
Timothy Teakettle ea071bd031 comment 2021-05-05 18:28:55 +01:00
Timothy Teakettle 3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
Timothy Teakettle ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
Artur 35bfba1f6a Redoes the variable changes into procs 2021-05-05 18:15:13 +03:00
Artur 28205f9dce More fixes to make it work 2021-05-05 17:41:37 +03:00
Timothy Teakettle 1664459b14 squash bugs 2021-05-05 15:26:56 +01:00
Artur d9f6e51bc8 making it actually work properly 2021-05-05 15:26:20 +03:00
Artur 92e6646a4c time to make blood even more pain 2021-05-05 14:44:21 +03:00
zerothebigboy b1c20269a6 he'sstillafurry 2021-05-05 03:38:14 -04:00
zerothebigboy 5138d86655 skylarlineman'safurry 2021-05-05 03:35:25 -04:00
timothyteakettle b2d8c980e4 task failed sucessfully 2021-05-05 00:54:44 +01:00
timothyteakettle f816bba62a bugfixes 2021-05-05 00:51:52 +01:00
silicons d7687c9f3a Merge pull request #14680 from keronshb/shadowalkengraved
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
2021-05-04 00:45:47 -06:00
silicons 1ce59b974c Merge pull request #14676 from Bapldap/patch-2
lesspopcrates(this one works)
2021-05-04 00:45:12 -06:00
keronshb be2e962983 Off Balance for Guns only again
Was intended for guns
2021-05-04 00:51:16 -04:00
silicons 45bc4fcb46 Merge pull request #14673 from TheObserver-sys/SovietCrate
Soviet Crates, now available!
2021-05-03 21:08:37 -06:00
silicons 2bf9c9d21f Merge pull request #14678 from SandPoot/fancy-gateway
Ports #55624 from tgstation
2021-05-03 21:07:03 -06:00
timothyteakettle 7265c7111c new limb covering var for markings 2021-05-03 22:47:22 +01:00
timothyteakettle fac2b259ac big changes 2 2021-05-03 22:43:45 +01:00
timothyteakettle f4bb5255ab Revert "big changes"
This reverts commit 7ac50b7ba2.
2021-05-03 22:43:32 +01:00
timothyteakettle 7ac50b7ba2 big changes 2021-05-03 22:43:22 +01:00
keronshb 834ec62c0b Nightmare Jaunt Change
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
2021-05-03 00:05:39 -04:00
zerothebigboy 5b973d6ef4 .......... 2021-05-02 23:36:17 -04:00
zerothebigboy 359c778955 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm
2021-05-02 22:47:39 -04:00
SandPoot 8f3a44f44a fancy gateway 2021-05-02 18:57:04 -03:00
Timothy Teakettle 93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle d32770a0fa test 2021-05-02 22:19:41 +01:00