Commit Graph

17436 Commits

Author SHA1 Message Date
DeltaFire
e5eff3b028 Merge pull request #13792 from Citadel-Station-13/silicons-patch-25
fixes TEG circulators not being movable when unanchored
2020-12-20 18:11:33 +01:00
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
DeltaFire
f458bc8182 Merge pull request #13803 from BlueWildrose/AI-RemoteDetonationCBT
Prevents traitor AI from doomsdaying while carded
2020-12-19 16:08:25 +01:00
BlueWildrose
98b1de5536 oh yes we don't want that do we? 2020-12-18 22:56:39 -07:00
DeltaFire
b37d948358 Merge pull request #13794 from Citadel-Station-13/silicons-patch-27
this one line broke atmos more at 10
2020-12-19 05:38:10 +01:00
DeltaFire
1e8e1ec72b Merge pull request #13786 from kiwedespars/why
x-ray laser nerfs
2020-12-19 05:28:43 +01:00
kiwedespars
9b710f5553 Update beams.dm 2020-12-18 15:53:11 -08:00
silicons
ca49f87e2c Merge pull request #13804 from timothyteakettle/please-sanitize-pin-data
[s] sanitizes circuits get pin data
2020-12-18 10:32:24 -07:00
Poojawa
6fe6e6d779 Update Citadel_Snowflake.dm 2020-12-18 01:36:56 -06:00
timothyteakettle
2aaddc2ee4 Update helpers.dm 2020-12-18 01:53:53 +00:00
Blue Wildrose
d4d5e53cb6 go away Travis 2020-12-16 19:27:04 -07:00
Blue Wildrose
9c60de46a1 Prevent AI from doomsdaying while carded 2020-12-16 18:45:41 -07:00
kiwedespars
98c3335dce doubles xray laser cost, 20 -> 10 shots 2020-12-15 21:04:10 -08:00
kiwedespars
a95ba25d17 Update beams.dm
25 -> 75 rad
15 -> 20 damage
2020-12-15 21:02:46 -08:00
keronshb
3d7c896100 Scarp Changes and Bundle
This should really fix it now.
2020-12-15 20:10:21 -05:00
silicons
1d81434bbd Update datum_pipeline.dm 2020-12-15 15:52:00 -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
bc9dbc0060 Update circulator.dm 2020-12-15 14:00:20 -07:00
silicons
4d6f2118c8 Update saved_circuits.dm 2020-12-15 13:32:27 -07:00
kiwedespars
92c70b8089 Update beams.dm 2020-12-14 19:46:28 -08: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