 r4d6
|
1eec1b11dd
|
Update passive_vent.dm
|
2020-01-18 20:00:07 -05:00 |
|
|
r4d6
|
ae5e87d492
|
Apparently TG has more code than us
|
2020-01-18 19:12:00 -05:00 |
|
|
r4d6
|
5084146400
|
Port
|
2020-01-18 18:46:22 -05:00 |
|
|
Ghommie
|
072eca6ec0
|
fixes and more PRs
|
2020-01-18 23:01:00 +01:00 |
|
|
Ghommie
|
3ee855ab77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 22:14:06 +01:00 |
|
|
Ghommie
|
ca7bdf5f88
|
clockwork cuirass now compatible with snakes. The original author is very lazy.
|
2020-01-18 22:06:14 +01:00 |
|
|
r4d6
|
810556cbb7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents
|
2020-01-18 16:03:49 -05:00 |
|
|
Lin
|
760bbfa8b6
|
Merge pull request #10571 from Ghommie/Ghommie-cit507
Riot foam dart design cost consistency.
|
2020-01-18 20:46:16 +00:00 |
|
|
Ghom
|
d709edb1c2
|
Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
|
2020-01-18 20:32:14 +01:00 |
|
|
Ghom
|
ce2fc37df3
|
Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
|
2020-01-18 20:16:30 +01:00 |
|
|
Ghom
|
9f2bc48d74
|
Merge pull request #10600 from Kraseo/ricetriangles
Fixes sprinkles on jelly donuts + lack of berry juice
|
2020-01-18 18:52:14 +01:00 |
|
|
Ghom
|
07b3bac674
|
Merge pull request #10580 from Putnam3145/craft-log
Craft logging
|
2020-01-18 17:47:31 +01:00 |
|
|
Ghom
|
29c3e72335
|
You jelly.
|
2020-01-18 17:41:31 +01:00 |
|
|
Putnam
|
133cb89b32
|
hilbert's hotel for ghost dojo
|
2020-01-18 06:55:26 -08:00 |
|
|
Kraseo
|
6708607073
|
fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly
|
2020-01-18 15:05:07 +01:00 |
|
|
Putnam
|
81cd277db2
|
Made metabolic synthesis stop if not fed
|
2020-01-18 03:47:40 -08:00 |
|
|
Putnam
|
95dc861ad8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into player-panel-can-reenter
|
2020-01-18 03:39:35 -08:00 |
|
|
Putnam
|
c612462b8c
|
some demodularization + new eligibility stuff
|
2020-01-18 03:39:27 -08:00 |
|
|
Seris02
|
fdf3871cb7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-18 18:30:51 +08:00 |
|
|
Seris02
|
04b34ec8ed
|
hijack implant
|
2020-01-18 18:04:31 +08:00 |
|
|
Putnam
|
3788bc6676
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
|
2020-01-17 21:33:13 -08:00 |
|
|
Putnam
|
a8569fa7e5
|
Makes it so that opting out of ass slapping is OPT OUT
|
2020-01-17 21:31:23 -08:00 |
|
|
chefferz
|
54a2b32f42
|
Update console.dm
|
2020-01-17 23:55:44 -05:00 |
|
|
r4d6
|
0d3706b7f9
|
Make public shuttle not require access
|
2020-01-17 22:15:29 -05:00 |
|
|
Ghommie
|
2fe23b67db
|
fug
|
2020-01-18 03:37:30 +01:00 |
|
|
Ghommie
|
224146ee1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444
|
2020-01-18 03:36:09 +01:00 |
|
|
kevinz000
|
fd440ac379
|
Merge pull request #10592 from Ghommie/Ghommie-cit508
Kevinz let some files fall back to CRLF.
|
2020-01-17 17:34:13 -07:00 |
|
|
Ghom
|
da8b29dd23
|
Merge pull request #10591 from Citadel-Station-13/kevinz000-patch-12
Removes blood duplication via virus mix
|
2020-01-18 01:25:34 +01:00 |
|
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
|
Ghommie
|
eaff51ff40
|
Kevinz let some files fall back to CRLF.
|
2020-01-17 23:26:05 +01:00 |
|
|
kevinz000
|
aea0de30d1
|
Merge pull request #10125 from Ghommie/Ghommie-cit449
Ports a few projectile code updates by ke:b:inz.
|
2020-01-17 15:15:08 -07:00 |
|
|
Ghom
|
34872f6969
|
Merge pull request #10570 from kevinz000/map_network_helpers
Power cable + atmos pipe auto mapping helpers
|
2020-01-17 22:34:38 +01:00 |
|
|
kevinz000
|
eddb6fda68
|
Update others.dm
|
2020-01-17 14:32:51 -07:00 |
|
|
kevinz000
|
3c2e6a959d
|
whitespace renormalize
|
2020-01-17 14:25:29 -07:00 |
|
|
kevinz000
|
05e2b6a441
|
Merge pull request #10569 from keronshb/RemoteMoodResearch
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
|
2020-01-17 14:24:13 -07:00 |
|
|
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 |
|
|
kevinz000
|
a4e2591223
|
typo
|
2020-01-16 21:22:07 -07:00 |
|
|
kevinz000
|
2cc0e8ee6c
|
k
|
2020-01-16 21:17:43 -07:00 |
|
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
|
kevinz000
|
d7a8494d2d
|
fix
|
2020-01-16 21:03:28 -07:00 |
|
|
kevinz000
|
9ef4cbfa76
|
refactor tags
|
2020-01-16 20:58:00 -07:00 |
|
|
kevinz000
|
2ba226b912
|
aa
|
2020-01-16 20:57:02 -07:00 |
|
|
Putnam
|
5ace1df9af
|
better logging, that also works
|
2020-01-16 19:09:13 -08:00 |
|