silicons
|
c7022445b5
|
Merge pull request #12800 from DeltaFire15/swarmer-fix
Fixes swarmers not being able to eat any items at all
|
2020-07-20 16:55:00 -07:00 |
|
silicons
|
4d4133a8da
|
Merge pull request #12819 from Arturlang/bloodsucker_typo
Fixes a bloodsucker lair typo
|
2020-07-20 16:53:42 -07:00 |
|
Lin
|
67a6330e77
|
Merge pull request #12786 from silicons/survivalists
makes survivalists pseudoantags again and limits summon guns/magic to one use
|
2020-07-20 18:20:08 -05:00 |
|
Artur
|
de5e87d522
|
Fixes a typo
|
2020-07-19 02:37:11 +03:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
silicons
|
e03948dcba
|
Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
|
2020-07-16 17:28:42 -07:00 |
|
DeltaFire
|
9e05d9f748
|
fixes swarmers not being able to eat any items
|
2020-07-16 23:26:46 +02:00 |
|
Letter N
|
abd0ac089d
|
https://github.com/tgstation/tgstation/pull/51687
|
2020-07-16 20:36:08 +08:00 |
|
silicons
|
f653fd5c3c
|
kay
|
2020-07-15 14:58:51 -07:00 |
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
silicons
|
feddd14176
|
Merge pull request #12714 from DeltaFire15/sents-compromise-aug
Fixes / Buffs sentinels compromise to heal augmented bodyparts aswell.
|
2020-07-11 00:48:37 -07:00 |
|
silicons
|
aae496492f
|
Update revenant.dm
|
2020-07-09 02:22:30 -07:00 |
|
DeltaFire
|
7aa160029f
|
changes sent's healing a bit
No more killing augmented followers, it heals them aswell. Ratvar is a machine god afterall.
|
2020-07-08 23:45:35 +02:00 |
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
Ghom
|
c5b94a4d00
|
Update code/modules/antagonists/revenant/revenant.dm
|
2020-07-04 18:30:01 +02:00 |
|
silicons
|
ca6fc8d813
|
Update revenant.dm
|
2020-07-04 06:48:00 -07:00 |
|
Artur
|
6c4e733a38
|
More testmerge fixes
|
2020-07-03 15:16:02 +03:00 |
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
Artur
|
f46d0b9409
|
Clockworkslab, skillpanel, telecoms works now
|
2020-07-02 23:21:11 +03:00 |
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
Artur
|
2797aefc3a
|
Clockworkslab and ui resizing
|
2020-06-30 01:05:43 +03:00 |
|
Putnam3145
|
ee2fedd4af
|
Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-06-29 12:44:33 -07:00 |
|
Putnam3145
|
42809d8b0c
|
Merge pull request #12416 from Ghommie/Ghommie-cit792
TGUI-next Check Skills menu.
|
2020-06-29 12:44:08 -07:00 |
|
Ghommie
|
fa25858fd7
|
Fix. :)
|
2020-06-29 21:31:24 +02:00 |
|
Ghom
|
b280c0f550
|
Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
|
2020-06-29 21:13:06 +02:00 |
|
Ghommie
|
5307676317
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792
|
2020-06-29 06:55:35 +02:00 |
|
silicons
|
45a6061958
|
Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
|
2020-06-27 14:53:28 -07:00 |
|
silicons
|
8b04fd70de
|
Merge pull request #12615 from Ghommie/Ghommie-cit821
Solving several issues.
|
2020-06-27 14:52:59 -07:00 |
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01:00 |
|
Ghommie
|
d1025b10cd
|
mh.
|
2020-06-26 18:49:20 +02:00 |
|
Ghommie
|
8f6b31c26e
|
Solving several issues.
|
2020-06-26 18:40:20 +02:00 |
|
Artur
|
765ffdb1a1
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-26 14:03:27 +03:00 |
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
Artur
|
940ddaeeb6
|
Clockworkslab work
Thanks to Letter N
|
2020-06-24 16:09:22 +03:00 |
|
Artur
|
517c0a348e
|
Damned clockworken slab
|
2020-06-23 13:15:49 +03:00 |
|
Ghommie
|
ae053a9a08
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
|
2020-06-23 03:12:49 +02:00 |
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
Detective Google
|
715b1f85da
|
prevents shunted AIs from doomsdaying (tg#51284)
|
2020-06-22 15:53:55 -05:00 |
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
Lin
|
2cd18f3dba
|
Merge pull request #12557 from silicons/life
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
|
2020-06-21 18:32:58 -05:00 |
|
Detective Google
|
4e26916502
|
Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald
|
2020-06-20 14:00:14 -05:00 |
|
Ghommie
|
d555394290
|
Let's just use tgstation's.
|
2020-06-19 19:01:05 +02:00 |
|
kevinz000
|
1336404eb6
|
last ones
|
2020-06-17 21:37:19 -07:00 |
|
kevinz000
|
445d94f335
|
haha whew
|
2020-06-17 21:32:10 -07:00 |
|
kevinz000
|
118ac1a775
|
Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
|
2020-06-17 20:10:04 -07:00 |
|
Detective Google
|
0e1db216c8
|
Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy)
|
2020-06-17 19:33:14 -05:00 |
|
Artur
|
92a60d6e68
|
Makes it actually work
|
2020-06-17 17:37:03 +03:00 |
|