Commit Graph

26025 Commits

Author SHA1 Message Date
DeltaFire 3bd1965c7d Merge pull request #13769 from MrJWhit/goose-bar-sign
Adds goose bar sign
2020-12-14 06:06:03 +01:00
DeltaFire 56963d2138 Merge pull request #13764 from Hatterhat/mech-sell
mechs leave no wrecks when sold on cargo shuttle
2020-12-14 06:04:21 +01:00
DeltaFire d3f3862e18 Merge pull request #13696 from silicons/slime_tf
refactors slime shapeshifting, blobform, and limb regrowth to generic mob ability datums for !!no reason at all other than code improvement!!
2020-12-14 05:57:03 +01:00
DeltaFire dab3f6f125 Merge pull request #13699 from silicons/nanite_updates
nanite updates: permanent nanites, hostile lockdown, anti-virus, resistance tweaking
2020-12-14 05:56:48 +01:00
DeltaFire aff0098b97 Merge pull request #13753 from Citadel-Station-13/silicons-patch-16
[testmerge this first]shoving yourself up now costs 50% more
2020-12-14 05:56:35 +01:00
DeltaFire 4437b28b34 Merge pull request #13751 from Citadel-Station-13/silicons-patch-13
standardizes text formatting to rp server's |one character| instead of ||two|| because why did i even do the latter
2020-12-14 05:50:51 +01:00
DeltaFire 1aa032df32 Merge pull request #13752 from Citadel-Station-13/silicons-patch-15
tweaks stamcrit to be removed when under 100 stamina damage, rather than at 140
2020-12-14 05:32:28 +01:00
DeltaFire 2f53ff7673 Merge pull request #13761 from Citadel-Station-13/silicons-patch-19
getting something_horrible'd now drops all items BEFORE you horribly die and turn into a pile of bones.
2020-12-14 05:26:20 +01:00
DeltaFire 396fda3c0c Merge pull request #13771 from MrJWhit/better-donut-box-sprites
Better donuts boxes
2020-12-14 05:23:30 +01:00
silicons e89e7da2fd Update xmas.dm 2020-12-13 18:55:07 -07:00
MrJWhit f5b99b83f8 Fully functional 2020-12-13 02:29:29 -05:00
MrJWhit 939d6b7ad8 goose barsign 2020-12-13 00:57:05 -05:00
Hatterhat 2a05c9df24 mechs leave no wrecks on sell 2020-12-12 21:25:17 -06:00
silicons 0d63fc9cf4 Update shuttles.dm 2020-12-12 19:02:56 -07:00
silicons 66403e3a9e Merge pull request #13713 from timothyteakettle/alt-click-gas-mask
all gas masks (but welding + glass) can be alt clicked to show/hide identity
2020-12-12 18:53:13 -07:00
Lin 0d95172bef Merge pull request #13749 from Citadel-Station-13/silicons-patch-7
fixes nonsensical verb
2020-12-12 20:00:41 +00:00
silicons ab9d26285c Update dna.dm 2020-12-12 10:13:17 -07:00
silicons abf950ee17 Update dna.dm 2020-12-12 02:49:27 -07:00
silicons c2727ca278 Merge pull request #13743 from Linzolle/thunderdome
thunderdome entertainment monitors fix + stuff
2020-12-12 01:55:53 -07:00
silicons fab40166d3 Merge pull request #13737 from qwertyquerty/flash
Flash the screen on climax
2020-12-12 01:52:17 -07:00
silicons c00fb31da8 Update dna.dm 2020-12-12 01:47:23 -07:00
Putnam3145 f0e51d666c Merge pull request #13617 from timothyteakettle/loadout-json
loadout 2: electric boogaloo
2020-12-11 18:11:56 -08:00
silicons 60f9e97ce5 test 2020-12-11 17:31:27 -07:00
DeltaFire e1bf6b94f9 Merge pull request #13747 from MrJWhit/thicc-fuel-tanks
Porting to the /tg/ sprite changes, and functionality, of large reagent containers
2020-12-11 22:38:18 +01:00
Lin c1fee8e5c4 Merge pull request #13739 from timothyteakettle/tongue-and-eyes
custom eyes and tongues now properly carry across cloning
2020-12-11 16:59:05 +00:00
Lin 4077537d45 Merge pull request #13734 from keronshb/Blobreflect-fix
Reflective Blob fix
2020-12-11 16:58:07 +00:00
MrJWhit d10c9db8b2 Update reagent_dispenser.dm 2020-12-11 10:31:42 -05:00
silicons e252e073a1 Update stamina_combat.dm 2020-12-11 03:06:29 -07:00
silicons 1153f30b63 Update carbon.dm 2020-12-11 02:26:52 -07:00
silicons 34f2a94d1b Update combat.dm 2020-12-11 02:23:26 -07:00
silicons 3891095a21 Update say.dm 2020-12-11 01:58:39 -07:00
DeltaFire bece5971b8 Merge pull request #13745 from Arturlang/soulstone_references
Adds more sanity to construct soul returning
2020-12-11 00:42:30 +01:00
silicons 8af8063e73 Update input.dm 2020-12-10 13:39:22 -07:00
keronshb 07b56e1542 Adds new line
new line added
2020-12-10 15:29:13 -05:00
MrJWhit 477330197c Huh we already had this 2020-12-10 01:14:43 -05:00
silicons a4e6df8f9a Merge pull request #13738 from DeltaFire15/heretic-tweaks
Updates the heretics gamemode with a bunch of changes from /tg/
2020-12-09 21:47:46 -07:00
silicons 821c3becc3 Merge pull request #13704 from Putnam3145/make-emotes-local
Makes emotes show up in the "local" filter with TGUI
2020-12-09 21:47:06 -07:00
tgstation-server 5b74596d72 Update TGS DMAPI 2020-12-10 00:47:22 +00:00
Artur ef13b07dd4 Forgot this 2020-12-09 17:56:28 +02:00
Artur 827920dba7 Paranoid ramblings 2020-12-09 17:54:44 +02:00
Linzolle 0ddc053a8b what if mapmerge worked 2020-12-08 17:35:21 -06:00
Linzolle 3e951d334c fix entertainment monitors 2020-12-08 17:21:14 -06:00
Timothy Teakettle 132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00:00
DeltaFire 69a1d6e603 oop 2020-12-08 16:32:34 +01:00
DeltaFire 86661a4fe0 aaaaaaaaaaaaaa 2020-12-08 16:30:09 +01:00
Lin e38543ae48 Merge pull request #13736 from DeltaFire15/abductor-surgery-robotstuff
Makes the experimental organ replacement surgery work on robots
2020-12-07 23:18:35 +00:00
timothyteakettle 43df7462d5 copy from old species 2020-12-07 23:03:28 +00:00
Timothy Teakettle 8846e69c42 ANOTHER ONE 2020-12-07 21:34:52 +00:00
Timothy Teakettle ac9e383638 WOOPS ONE MORE DEBUG MESSAGE 2020-12-07 21:28:17 +00:00
DeltaFire b186ec96ad rune invisible to sillycones. 2020-12-07 22:19:30 +01:00