silicons
|
b34f5d56f6
|
Merge remote-tracking branch 'citadel/master' into respawn_system_2
|
2020-12-13 22:54:16 -07:00 |
|
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
|
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
|
31beb2dd62
|
Update colormate.dm
|
2020-12-13 06:41:40 -07:00 |
|
silicons
|
28a0725bd8
|
Update colormate.dm
|
2020-12-13 06:36:20 -07:00 |
|
silicons
|
99709a1a35
|
fix
|
2020-12-13 04:30:00 -07: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 |
|
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 |
|
Hatterhat
|
04c35f3161
|
now this is actually based
|
2020-12-12 20:48:59 -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 |
|
Timothy Teakettle
|
85b6248f48
|
remove the second check
|
2020-12-13 02:32:09 +00: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 |
|
timothyteakettle
|
76b291c0b5
|
action
|
2020-12-13 01:16:25 +00:00 |
|
Timothy Teakettle
|
7dfb097bcc
|
close enough
|
2020-12-12 23:48:21 +00: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
|
07d8e72125
|
fix
|
2020-12-12 11:19:45 -07:00 |
|
silicons
|
24c09edd03
|
stuff
|
2020-12-12 11:12:45 -07: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
|
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 |
|
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 |
|
timothyteakettle
|
3a017d1173
|
it works
|
2020-12-12 01:49:50 +00:00 |
|
silicons
|
60f9e97ce5
|
test
|
2020-12-11 17:31:27 -07: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 |
|