Commit Graph

18546 Commits

Author SHA1 Message Date
keronshb
830ae2b1c3 Code for preventing it on moving onto a space tile
For some reason this doesn't work so I've commented it out until I can figure out how to get it to work.
2020-12-15 12:14:49 -05:00
silicons
0a593013e0 wew 2020-12-15 07:23:46 -07:00
silicons
e87cc27803 modifications 2020-12-15 07:21:06 -07:00
kiwedespars
92c70b8089 Update beams.dm 2020-12-14 19:46:28 -08:00
Putnam
f4d15f189b Also made alien threat WAY higher. 2020-12-14 18:38:11 -08:00
silicons
2844d2e4de fix 2020-12-14 06:01:32 -07:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +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
silicons
413bd23d0a dnr prevention 2020-12-13 23:07:12 -07:00
silicons
b34f5d56f6 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 22:54:16 -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
4451a96997 fixes 2020-12-13 20:12:14 -07: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
silicons
e79ce41f24 Update code/modules/mob/living/death.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2020-12-13 16:41:01 -07:00
Timothy Teakettle
016d3d39fc emote over holopad 2020-12-13 22:18:54 +00:00
DeltaFire
2318915246 smol 2020-12-13 19:52:51 +01:00
keronshb
b42368d371 Clown Car The Honkening
The return of the clowncar, with slight hugbox.
2020-12-13 13:49:09 -05:00
silicons
5c830d4d44 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 02:34:57 -07:00
silicons
a4688557d7 Cryo 2020-12-13 02:29:31 -07: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
07d8e72125 fix 2020-12-12 11:19:45 -07:00
silicons
24c09edd03 stuff 2020-12-12 11:12:45 -07:00
silicons
4b20d26d2b Merge remote-tracking branch 'citadel/master' into colormates 2020-12-12 01:56:37 -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
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
silicons
45a7c68da1 wow 2020-12-11 15:05:00 -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
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
317f33b4e5 fixes 2020-12-11 05:14:23 -07: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