 kevinz000
|
edccfa3523
|
Update others.dm
|
2020-01-17 14:15:08 -07:00 |
|
|
kevinz000
|
e69253bf87
|
Update others.dm
|
2020-01-17 14:12:51 -07:00 |
|
|
Trilbyspaceclone
|
2b2e694341
|
Update code/modules/cargo/packs/science.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-01-17 15:56:09 -05:00 |
|
|
Artur
|
300fdb431c
|
0 clue if itll even work. Cowabunga it is.
|
2020-01-17 19:46:27 +01:00 |
|
|
Ghom
|
72a83f05b5
|
Merge pull request #10375 from r4d6/radsuit
Add a Radiation Hardsuit
|
2020-01-17 17:36:43 +01:00 |
|
|
Ghom
|
e7b925e779
|
Merge pull request #10582 from Putnam3145/more_flavor
Made temp flavor "more" pop up with actual temp flavor
|
2020-01-17 14:44:04 +01:00 |
|
|
Putnam
|
ae4afdd904
|
made it work (wow!)
|
2020-01-17 03:09:46 -08:00 |
|
|
Putnam
|
c735123e4e
|
consent logging and arousal tweaks
|
2020-01-17 02:47:16 -08:00 |
|
|
Putnam
|
5ace1df9af
|
better logging, that also works
|
2020-01-16 19:09:13 -08:00 |
|
|
Ghom
|
c1e9618757
|
Merge pull request #10565 from Citadel-Station-13/revert-10379-tg-47443-shotgunpbs
Revert "shotgun pointblanking people actually throws them"
|
2020-01-16 23:18:37 +01:00 |
|
|
kevinz000
|
d110d7bae9
|
Merge pull request #10347 from deathride58/stambufferbuff
[experimental] Buffs the stamina buffer by making it recharge for free.
|
2020-01-16 14:51:38 -07:00 |
|
|
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 |
|
|
Ghom
|
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 |
|
|
Artur
|
1f718df41a
|
Reverts crafting changes
|
2020-01-16 14:26:36 +02:00 |
|
|
Artur
|
c05ee11533
|
Fixes buggy interfaces for chemical stuff
|
2020-01-16 12:16:13 +02:00 |
|
|
Artur
|
3a132d0a25
|
Linter fixes
|
2020-01-16 11:45:46 +02:00 |
|
|
Artur
|
472d18403c
|
Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties
|
2020-01-16 11:38:09 +02:00 |
|
|
Artur
|
6e4829e971
|
Really works properly now
|
2020-01-16 11:33:05 +02:00 |
|
|
Tupinambis
|
dd9e62c8bb
|
Sillycon law prevention clause removal.
|
2020-01-15 23:15:18 -06: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 |
|
|
Ghom
|
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 |
|
|
Ghom
|
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 |
|
|
kevinz000
|
554f23e790
|
aight bet
|
2020-01-15 18:04:05 -07:00 |
|
|
kevinz000
|
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 |
|
|
r4d6
|
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 |
|
|
Ghom
|
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 |
|
|
Ghom
|
5eb26682e2
|
Merge pull request #10557 from timothyteakettle/timothyteakettle-gene-modder-1
remove trait genes without disks
|
2020-01-15 14:54:11 +01:00 |
|
|
kevinz000
|
b0c2e4cbdd
|
Revert "shotgun pointblanking people actually throws them"
|
2020-01-15 01:13:26 -07:00 |
|
|
Artur
|
bede695ebd
|
Undoes minter changes
|
2020-01-15 09:49:57 +02:00 |
|