silicons
|
697619856c
|
Merge pull request #13859 from timothyteakettle/unlockable-loadout-items
unlockable loadout items
|
2021-01-03 18:07:18 -07:00 |
|
Timothy Teakettle
|
813e0f4c79
|
Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items
|
2021-01-01 22:30:04 +00:00 |
|
DeltaFire
|
38565e0027
|
Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
|
2021-01-01 04:14:26 +01:00 |
|
silicons
|
6e86cc7758
|
wew
|
2020-12-28 17:27:16 -08:00 |
|
tgstation-server
|
14cefb2d35
|
Update TGS DMAPI
|
2020-12-29 00:59:40 +00:00 |
|
silicons
|
50de8d7590
|
Update atmospherics.dm
|
2020-12-27 12:43:21 -07:00 |
|
silicons
|
c25c6b01d7
|
Update atmospherics.dm
|
2020-12-27 12:41:07 -07:00 |
|
Timothy Teakettle
|
c3e9cdd9a5
|
finale
|
2020-12-26 23:09:19 +00:00 |
|
DeltaFire
|
d3f30d21cf
|
Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
|
2020-12-22 17:40:33 +01:00 |
|
DeltaFire
|
65c14cf289
|
Merge pull request #13537 from silicons/permissions
support update for event manager permissions
|
2020-12-22 16:12:03 +01:00 |
|
silicons
|
b34f5d56f6
|
Merge remote-tracking branch 'citadel/master' into respawn_system_2
|
2020-12-13 22:54:16 -07: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
|
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 |
|
silicons
|
5c830d4d44
|
Merge remote-tracking branch 'citadel/master' into respawn_system_2
|
2020-12-13 02:34:57 -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
|
45a7c68da1
|
wow
|
2020-12-11 15:05:00 -07:00 |
|
silicons
|
e252e073a1
|
Update stamina_combat.dm
|
2020-12-11 03:06:29 -07:00 |
|
silicons
|
34f2a94d1b
|
Update combat.dm
|
2020-12-11 02:23:26 -07: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 |
|
tgstation-server
|
5b74596d72
|
Update TGS DMAPI
|
2020-12-10 00:47:22 +00:00 |
|
DeltaFire
|
73d3234882
|
buncha changes
|
2020-12-07 22:15:04 +01:00 |
|
timothyteakettle
|
61cc33d995
|
Merge remote-tracking branch 'upstream/master' into loadout-json
|
2020-12-06 17:26:04 +00:00 |
|
timothyteakettle
|
0f540884eb
|
Merge branch 'master' into loadout-json
|
2020-12-06 17:24:24 +00:00 |
|
Timothy Teakettle
|
d0ebd6c2d8
|
green blood
|
2020-11-30 19:22:54 +00:00 |
|
silicons
|
8fa69c458b
|
Merge pull request #13707 from DeltaFire15/synthetic-alcohol-intolerance
Makes synthetics inherently immune to alcohol
|
2020-11-25 22:23:05 -07:00 |
|
silicons
|
fa516b1097
|
Merge pull request #13685 from uomo91/adminlogging
Ports: Admins can now see chronological order of events in logging tabs.
|
2020-11-25 22:21:34 -07:00 |
|
DeltaFire
|
282a5d6ab2
|
aaactually lets just make robots immune in general
|
2020-11-24 20:32:42 +01:00 |
|
DeltaFire
|
a3208d1ac8
|
synth alcohol immunity
|
2020-11-24 20:27:34 +01:00 |
|
silicons
|
13ebceb670
|
why did i do this
|
2020-11-22 14:56:02 -07:00 |
|
silicons
|
37e26833a6
|
wew
|
2020-11-22 14:16:14 -07:00 |
|
silicons
|
c7396632db
|
Merge pull request #13582 from timothyteakettle/i-hate-mcolor
adds advanced colouring mode: allows you to individually colour mutant parts
|
2020-11-22 13:33:28 -07:00 |
|
silicons
|
86b584fab5
|
typos
|
2020-11-21 21:08:55 -07:00 |
|
silicons
|
27c4dff507
|
ports
|
2020-11-21 21:02:54 -07:00 |
|
uomo91
|
cfaa988217
|
Merge master and fix newline conflict.
|
2020-11-19 17:12:19 -06:00 |
|
silicons
|
f8d43b7544
|
Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
|
2020-11-18 22:54:51 -07:00 |
|
Putnam3145
|
9d300ade35
|
Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
|
2020-11-18 17:50:38 -08:00 |
|
silicons
|
891d4ec76e
|
Merge pull request #13681 from DeltaFire15/supplypod-shrapnel
Fixes a bunch of supplypod related stuff
|
2020-11-17 01:12:56 -07:00 |
|
tgstation-server
|
03b2f1ac2e
|
Update TGS DMAPI
|
2020-11-17 00:37:11 +00:00 |
|
uomo91
|
b3e314e3ea
|
Bitflag define.
|
2020-11-16 01:36:46 -06:00 |
|
DeltaFire
|
410ffffcc3
|
there we go
robot rad safe: 250, 750 with upgrade (500 for normal mobs)
Also some typo fixes
|
2020-11-15 20:30:50 +01:00 |
|
DeltaFire
|
e0b2156142
|
fixes fixes fixes
|
2020-11-14 19:26:54 +01:00 |
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
DeltaFire
|
5af48a22dd
|
adds a surgery to fix corruption
|
2020-11-13 02:24:52 +01:00 |
|
DeltaFire
|
76fe1a77bc
|
Merge remote-tracking branch 'upstream/master' into system-corruption
|
2020-11-13 01:00:50 +01:00 |
|
silicons
|
0001a2edca
|
Merge pull request #13669 from Arturlang/sacrifice_tweaks
Makes cult sacrifice not permakill people anymore.
|
2020-11-11 11:16:15 -07:00 |
|
Artur
|
503d0156c6
|
Does the thing
|
2020-11-08 23:24:58 +02:00 |
|
LetterJay
|
10c90e06c1
|
Merge pull request #13661 from timothyteakettle/age-verification
adds in-game age verification as an alternative to access requests
|
2020-11-08 11:07:05 -06:00 |
|
Timothy Teakettle
|
7a82f53e75
|
attempte fixes
|
2020-11-08 16:45:32 +00:00 |
|