Commit Graph

9198 Commits

Author SHA1 Message Date
Artur 66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur 16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
Artur 3737c52df8 Funny actions 2021-01-20 15:23:34 +02:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons f0a9a7a179 fix 2021-01-19 04:21:21 -07:00
Lin 5eafdd164f Merge pull request #14069 from Citadel-Station-13/silicons-patch-18
moves say_emphasis from compose_message to lang_treat to prevent _underlines_ from colliding with command_headset spans having _ in it
2021-01-18 13:21:13 -06:00
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
silicons 98bc547c5b Update say.dm 2021-01-16 01:07:52 -07: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
silicons ea56565872 fix 2021-01-14 20:19:04 -07:00
Hatterhat 798b25846d gauze parity 2021-01-14 20:53:55 -06:00
The0bserver e01c57c832 Show me the opposite of funny! 2021-01-14 01:12:53 -05: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
silicons 8f7b483161 remove reverb 2021-01-13 21:37:30 -07:00
The0bserver ffe401544c First wave of fixing 2021-01-13 23:35:37 -05:00
The0bserver 55cd69746d A change in tact, perhaps? 2021-01-13 23:08:05 -05:00
The0bserver 2b8b9086ec Revert "Initial Commit:Goodbye rifle! You won't be missed!"
This reverts commit 1836d0106a.
2021-01-13 22:14:36 -05:00
The0bserver 1836d0106a Initial Commit:Goodbye rifle! You won't be missed! 2021-01-13 21:42:08 -05:00
silicons bcb2e16cef Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
2021-01-13 16:53:01 -07:00
silicons 9ddb3dc5d9 fix 2021-01-13 16:22:43 -07:00
silicons ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -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
silicons 343ef7db2c fixes 2021-01-13 14:23:35 -07:00
silicons 3fe2776a6a fix 2021-01-13 13:44:46 -07:00
Lin 04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
2021-01-13 18:40:03 +00: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
Artur 2f619ffc4e Traits 2021-01-13 10:27:10 +02:00
Artur d5e99e9cef TESTING 2021-01-13 05:56:10 +02: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
Lin f4c4e0721b Merge pull request #14012 from Citadel-Station-13/silicons-patch-6
fixes colormate last_matrix saving (again)
2021-01-10 19:36:47 +00:00
silicons 2525334bb0 smooth movement twaeks 2021-01-09 15:30:56 -08:00
silicons 9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00