Commit Graph

5695 Commits

Author SHA1 Message Date
Lin 73213b4bad Merge pull request #14079 from LetterN/patch-3
Fixes this vending oversight
2021-01-18 13:17:05 -06:00
silicons 2266a9e17b Merge pull request #14037 from DeltaFire15/nanogel
Nanogel for robotic limbs
2021-01-17 20:42:19 -07:00
silicons 829e946755 Merge pull request #14061 from Hatterhat/gauze-parity
something something gauze things
2021-01-17 20:40:09 -07:00
Letter N 0b088be4df missing , 2021-01-17 18:00:43 +08:00
Letter N 919b8c8d57 Update machine_circuitboards.dm 2021-01-17 17:54:06 +08:00
DeltaFire 3e917653c7 Merge pull request #14044 from corin9090/beadies
Belt slot prayer beads
2021-01-15 18:50:14 +01:00
DeltaFire d331dd4b1e Merge pull request #14046 from Citadel-Station-13/silicons-patch-10
buffs and fixes BOOMERANG STUNBATONS
2021-01-15 18:30:32 +01:00
DeltaFire de40e96180 Merge pull request #14047 from Citadel-Station-13/silicons-patch-11
boomerangs now properly turn ON your throw mode rather than turning it off when it already is
2021-01-15 18:30:16 +01:00
DeltaFire aa1cae9f33 Merge pull request #14054 from TheObserver-sys/AReturnToForm
Returns the Maintenance Shotgun to it's original recipe. Removes the Maintenance Rifle, and associated items.
2021-01-15 18:22:05 +01:00
Hatterhat 798b25846d gauze parity 2021-01-14 20:53:55 -06:00
The0bserver 1b469bdfda The power of overwriting... 2021-01-14 01:03:48 -05:00
silicons 1df2257e61 Merge pull request #14052 from SiliconMain/baitbegone
Update engineering.dm
2021-01-13 22:43:01 -07:00
SiliconMain cccb547a72 Update engineering.dm 2021-01-13 23:41:49 -06:00
The0bserver ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00
silicons bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
2021-01-13 16:53:01 -07:00
silicons 06bc57580a Update stunbaton.dm 2021-01-13 15:22:41 -07:00
silicons 701bacd355 Update stunbaton.dm 2021-01-13 15:06:35 -07:00
DeltaFire a9b420f68f Merge pull request #14038 from Hatterhat/atomization-never-heard-of-her
an unatomic PR designed for maximizing maintainer suffering
2021-01-13 18:28:59 +01:00
corin9090 9f0280309d Belt slot prayer beads
uwu
2021-01-13 09:24:55 -08:00
DeltaFire 6192d4ddab fixes 2021-01-13 00:08:59 +01:00
DeltaFire f591bff85b sprite stuff 2021-01-12 23:54:40 +01:00
DeltaFire 032c169098 whoops 2021-01-12 23:29:51 +01:00
Hatterhat 2042de0f19 sterilegauze buff 2021-01-12 16:13:08 -06:00
Hatterhat cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
DeltaFire 13beddd42b nanogel time 2021-01-12 23:02:44 +01:00
SiliconMain 2d3e24fee4 Update engineering.dm 2021-01-12 14:43:54 -06:00
Blue Wildrose 059d35921a quit making me drop my catgirl 2021-01-12 13:41:23 -07:00
silicons 656691912e Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
2021-01-09 15:39:06 -07:00
silicons fffafff5d3 Merge pull request #13995 from DeltaFire15/xeno-clickdelay
(Somewhat) fixes clickdelay when attacking objects.
2021-01-09 15:38:07 -07:00
silicons 22a32d25b4 Merge pull request #14006 from DeltaFire15/borg-shell-dupe
Attempting to complete a borg AI shell without a cell installed no longer causes issues
2021-01-09 15:37:45 -07:00
DeltaFire 23c5f1744d actually 2021-01-09 00:12:10 +01:00
DeltaFire 4f3df626c6 no cell no problem 2021-01-09 00:09:17 +01:00
silicons 1022837827 Update misc.dm 2021-01-08 01:29:20 -07:00
Putnam3145 5cde6e0157 Merge pull request #13871 from silicons/debris
Merry Christmas - GIVING JANITORS A JOB
2021-01-08 00:26:52 -08:00
silicons 407b1fe071 Update humans.dm 2021-01-07 23:14:59 -07:00
DeltaFire d153d82441 Merge pull request #13931 from shellspeed1/porting-turret
Ports disposable sentry gun for station engineers as a traitor item from TG
2021-01-08 02:59:48 +01:00
DeltaFire 108eace16e fix 2021-01-08 02:37:39 +01:00
DeltaFire d100fe1d58 Merge pull request #13981 from MrJWhit/caution-sign
Porting the ability to wear the caution sign (plus a random metastation fix)
2021-01-07 20:17:03 +01:00
DeltaFire 3d09edfc4b Merge pull request #13978 from Citadel-Station-13/silicons-patch-3
removes c4 mob gibbing
2021-01-07 06:22:06 +01:00
shellspeed1 926b4ca609 Merge branch 'porting-turret' of https://github.com/shellspeed1/Citadel-Station-13 into porting-turret 2021-01-06 18:48:47 -08:00
shellspeed1 21e81faff5 Update traitordevices.dm 2021-01-06 18:48:02 -08:00
shellspeed1 b5e8d3308c Update traitordevices.dm 2021-01-06 18:40:49 -08:00
silicons 90826aeb28 Update robot_parts.dm 2021-01-06 19:39:28 -07:00
shellspeed1 67364f4254 Update traitordevices.dm 2021-01-06 18:26:07 -08:00
MrJWhit ba98a0aacd Update miscellaneous.dm 2021-01-06 14:42:00 -05:00
DeltaFire 3f736aaa36 Merge pull request #13834 from zeroisthebiggay/pogbox
ports the traitor assistant POGBOX that scales damage with tc from /TG/
2021-01-06 19:29:17 +01:00
MrJWhit abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
silicons ab59a0d035 Update plastic.dm 2021-01-05 23:38:33 -07:00
Xantholne 18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
Xantholne fe4f184792 good night disky 2021-01-04 03:50:43 -07:00