 keronshb
|
69b5164103
|
Merge branch 'master' into RemoteMoodResearch
|
2020-01-16 15:50:11 -05:00 |
|
|
r4d6
|
ce16c91b2f
|
Code changes
|
2020-01-16 14:08:14 -05:00 |
|
|
GhomandGitHub
|
ca13be3c92
|
Merge pull request #10456 from Putnam3145/arousal-bad
Removes arousal damage and replaces it with simpler systems
|
2020-01-16 13:30:31 +01:00 |
|
|
kevinz000
|
88d6c1a166
|
OKFINE
|
2020-01-15 22:02:07 -07:00 |
|
|
kevinz000
|
327c1e04e0
|
s
|
2020-01-15 22:00:08 -07:00 |
|
|
r4d6
|
f98f033bb3
|
Fix linter
|
2020-01-15 23:57:13 -05:00 |
|
|
Putnam
|
de4e65c467
|
Savefile conversion for inesct
|
2020-01-15 20:13:09 -08:00 |
|
|
kevinz000
|
512b112154
|
happythink
|
2020-01-15 20:45:05 -07:00 |
|
|
kevinz000
|
ab0c1f3f59
|
oh it's a list
|
2020-01-15 19:36:20 -07:00 |
|
|
kevinz000
|
4f665930cc
|
a a
|
2020-01-15 19:32:38 -07:00 |
|
|
GhomandGitHub
|
7d9f4f9fe5
|
Merge pull request #10417 from kevinz000/nightshift_1
Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc
|
2020-01-16 03:21:49 +01:00 |
|
|
GhomandGitHub
|
70c1b0635a
|
early returns.
|
2020-01-16 03:14:39 +01:00 |
|
|
Ghommie
|
9c526d0348
|
riot foam dart design cost consistency.
|
2020-01-16 02:56:58 +01:00 |
|
|
kevinz000
|
b42de8d457
|
compile
|
2020-01-15 18:49:29 -07:00 |
|
|
r4d6
|
8bc8edb56f
|
Fixes
|
2020-01-15 20:46:28 -05:00 |
|
|
kevinz000
|
c710c332e4
|
compile
|
2020-01-15 18:37:09 -07:00 |
|
|
kevinz000
|
e8d8d32a33
|
ree
|
2020-01-15 18:34:16 -07:00 |
|
|
kevinz000
|
90be124730
|
Merge remote-tracking branch 'citadel/master' into map_network_helpers
|
2020-01-15 18:30:14 -07:00 |
|
|
kevinz000
|
2a4e2204c5
|
no definemania then..
|
2020-01-15 18:29:45 -07:00 |
|
|
kevinz000
|
8f7460ff96
|
definemania
|
2020-01-15 18:24:13 -07:00 |
|
|
kevinz000
|
c5b95ff5d0
|
Mapping helpers
|
2020-01-15 18:22:43 -07:00 |
|
|
kevinz000andGitHub
|
554f23e790
|
aight bet
|
2020-01-15 18:04:05 -07:00 |
|
|
|
872628d9aa
|
Apply suggestions from code review
thank you gamer
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-01-15 18:02:23 -07:00 |
|
|
r4d6andGitHub
|
755b0fac3c
|
Merge branch 'master' into Passive-Vents
|
2020-01-15 19:15:50 -05:00 |
|
|
r4d6
|
6045d818d8
|
Add passive vents
|
2020-01-15 19:12:13 -05:00 |
|
|
Putnam
|
d29603ad77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-15 15:57:32 -08:00 |
|
|
r4d6
|
f7791c3db7
|
Hopefully help travis
|
2020-01-15 17:27:09 -05:00 |
|
|
r4d6
|
e685c3fc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
|
2020-01-15 17:15:21 -05:00 |
|
|
Ghommie
|
4b090f938c
|
ok
|
2020-01-15 20:51:36 +01:00 |
|
|
GhomandGitHub
|
7b34daae48
|
Merge pull request #10563 from Trilbyspaceclone/patch-268
Makes fragile suit less likely to brake from toys
|
2020-01-15 15:51:15 +01:00 |
|
|
GhomandGitHub
|
5eb26682e2
|
Merge pull request #10557 from timothyteakettle/timothyteakettle-gene-modder-1
remove trait genes without disks
|
2020-01-15 14:54:11 +01:00 |
|
|
kevinz000andGitHub
|
b0c2e4cbdd
|
Revert "shotgun pointblanking people actually throws them"
|
2020-01-15 01:13:26 -07:00 |
|
|
HatterhatandGitHub
|
7b322ff467
|
Merge branch 'master' into greytide-standard-uniform
|
2020-01-14 19:39:16 -06:00 |
|
|
TrilbyspacecloneandGitHub
|
5351bc9f8a
|
Update miscellaneous.dm
|
2020-01-14 19:15:35 -05:00 |
|
|
GhomandGitHub
|
8a06f2f45c
|
Merge pull request #10499 from Hatterhat/tg-40046
more /tg/station ports - tools! logging! some other fun stuff!
|
2020-01-15 01:05:36 +01:00 |
|
|
GhomandGitHub
|
5dee355381
|
Merge pull request #10530 from kappa-sama/modularer
deletes modular items but this time i don't get cucked
|
2020-01-15 00:47:38 +01:00 |
|
|
Ghommie
|
26d6e7f05c
|
Work.
|
2020-01-14 22:04:38 +01:00 |
|
|
Ghommie
|
3984943b0d
|
[s] makes master compile.
|
2020-01-14 20:02:26 +01:00 |
|
|
GhomandGitHub
|
03ebab6ec5
|
Merge pull request #10454 from Commandersand/clothsfix
fixes clothing directional sprites(i swear not all of them are my fault)
|
2020-01-14 18:24:50 +01:00 |
|
|
GhomandGitHub
|
99a6214d22
|
Merge pull request #10538 from Putnam3145/chemistry-aaa
Fixes to chemistry
|
2020-01-14 13:52:10 +01:00 |
|
|
GhomandGitHub
|
77bdc8ee58
|
Merge pull request #10558 from DeltaFire15/clockfixes
Slimepeople can no longer just chill on vitality matrixes
|
2020-01-14 13:51:03 +01:00 |
|
|
GhomandGitHub
|
9189455fb1
|
Merge pull request #10549 from Seris02/durathread
durathread winter coats from hyper
|
2020-01-14 13:49:53 +01:00 |
|
|
Putnam
|
21dde64da2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into chemistry-aaa
|
2020-01-14 03:27:03 -08:00 |
|
|
HatterhatandGitHub
|
464b893790
|
Merge branch 'master' into tg-40046
|
2020-01-13 23:06:48 -06:00 |
|
|
Seris02
|
d46f3232f9
|
tada
|
2020-01-14 10:57:32 +08:00 |
|
|
timothyteakettleandGitHub
|
17ce27bd70
|
remove trait genes without disks
botany fix that lets you remove trait genes without having to have a redundant disk inserted
|
2020-01-13 23:23:49 +00:00 |
|
|
Ghommie
|
1d948907f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-13 23:26:21 +01:00 |
|
|
kappa-samaandGitHub
|
3f57f30e14
|
Merge branch 'master' into modularer
|
2020-01-13 16:32:00 -05:00 |
|
|
GhomandGitHub
|
330d96d549
|
Merge pull request #10409 from kevinz000/isbanned2
IT WORKED ON LOCAL
|
2020-01-13 18:49:46 +01:00 |
|
|
GhomandGitHub
|
984c43116c
|
Merge pull request #10539 from Savotta/cum
ports hShark snout from hyper-station-13
|
2020-01-13 16:07:28 +01:00 |
|