Commit Graph

17420 Commits

Author SHA1 Message Date
silicons
a41e1b1077 Update ninjaDrainAct.dm 2020-12-18 05:00:16 -07:00
silicons
029c755e15 Update ninjaDrainAct.dm 2020-12-16 02:49:37 -07:00
Lin
d776bcc867 Merge pull request #13791 from Citadel-Station-13/silicons-patch-23
[s]Update saved_circuits.dm
2020-12-15 21:46:48 +00:00
Lin
c022956c75 Merge pull request #13725 from silicons/anti_collision_bindings
makes keybind system automatically generate anti-collision keybinds where necessary to avoid unintentional macro fires
2020-12-15 21:24:30 +00:00
silicons
4a30064a2c Update saved_circuits.dm 2020-12-15 14:09:44 -07:00
silicons
4d6f2118c8 Update saved_circuits.dm 2020-12-15 13:32:27 -07:00
silicons
4db78b7868 Merge pull request #13757 from timothyteakettle/better-age-verification
changes the age gate to use date of birth
2020-12-13 23:09:41 -07:00
silicons
13bb064302 Merge pull request #13758 from timothyteakettle/better-holoforms
replaces custom holoform verb with an action, lets holoform AIs emote
2020-12-13 23:09:34 -07: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
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
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
timothyteakettle
4cb93931d4 let them beep 2020-12-14 01:00:29 +00:00
Timothy Teakettle
016d3d39fc emote over holopad 2020-12-13 22:18:54 +00:00
MrJWhit
f5b99b83f8 Fully functional 2020-12-13 02:29:29 -05:00
Hatterhat
2a05c9df24 mechs leave no wrecks on sell 2020-12-12 21:25:17 -06:00
Timothy Teakettle
76fe9c7f4c swap cooldown and cooldown check lines 2020-12-13 02:34:52 +00:00
Timothy Teakettle
866220aefb better cooldown 2020-12-13 02:33:57 +00: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
timothyteakettle
76b291c0b5 action 2020-12-13 01:16:25 +00: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
Putnam3145
f0e51d666c Merge pull request #13617 from timothyteakettle/loadout-json
loadout 2: electric boogaloo
2020-12-11 18:11:56 -08:00
timothyteakettle
3a017d1173 it works 2020-12-12 01:49:50 +00: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
Timothy Teakettle
99f50addc7 wip 2020-12-11 20:35:37 +00:00
Timothy Teakettle
45b22b2855 final touches 2020-12-11 19:41:56 +00: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
1153f30b63 Update carbon.dm 2020-12-11 02:26:52 -07:00
timothyteakettle
d1003c206a debug 2020-12-11 01:57:09 +00: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
Timothy Teakettle
62b5430985 yes 2020-12-10 21:53:20 +00: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
timothyteakettle
73542f6688 Update new_player.dm 2020-12-09 17:49:52 +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
timothyteakettle
264b72f91d better verification 2020-12-09 02:01:37 +00:00
Linzolle
3e951d334c fix entertainment monitors 2020-12-08 17:21:14 -06:00
Timothy Teakettle
d3ad092869 new proc 2020-12-08 22:23:58 +00:00
Timothy Teakettle
132a3c9526 color non polychromic items 2020-12-08 19:29:34 +00: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