 kevinz000
|
ecddef2f21
|
compile
|
2020-01-19 22:58:08 -07:00 |
|
|
kevinz000
|
0b10b8cf89
|
Update code/game/objects/items/devices/PDA/PDA.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-01-19 22:41:19 -07:00 |
|
|
kevinz000
|
374f4f143e
|
Update PDA.dm
|
2020-01-19 13:45:16 -07:00 |
|
|
kevinz000
|
72e2961972
|
Update PDA.dm
|
2020-01-18 21:34:24 -07:00 |
|
|
kevinz000
|
9619a6bf5d
|
Update PDA.dm
|
2020-01-18 19:37:12 -07:00 |
|
|
kevinz000
|
7b8cb0dbfc
|
Update PDA.dm
|
2020-01-18 19:33:22 -07:00 |
|
|
kevinz000
|
bc18ba314a
|
Update PDA.dm
|
2020-01-18 19:21:47 -07:00 |
|
|
CitadelStationBot
|
4d06c2d2d3
|
Automatic changelog generation for PR #10568 [ci skip]
|
2020-01-18 15:13:26 -06:00 |
|
|
Ghom
|
2147a2024f
|
Merge pull request #10568 from r4d6/Passive-Vents
Add passive vents
|
2020-01-18 22:13:23 +01:00 |
|
|
r4d6
|
4e6ad84317
|
Fix conflict
|
2020-01-18 16:05:56 -05: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 |
|
|
CitadelStationBot
|
bb6101f9a3
|
Automatic changelog generation for PR #10571 [ci skip]
|
2020-01-18 14:46:19 -06: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 |
|
|
CitadelStationBot
|
0cc3795f15
|
Automatic changelog generation for PR #10578 [ci skip]
|
2020-01-18 13:32:17 -06:00 |
|
|
Ghom
|
d709edb1c2
|
Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
|
2020-01-18 20:32:14 +01:00 |
|
|
CitadelStationBot
|
0bc10319d9
|
Automatic changelog generation for PR #10501 [ci skip]
|
2020-01-18 13:16:32 -06:00 |
|
|
Ghom
|
ce2fc37df3
|
Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
|
2020-01-18 20:16:30 +01:00 |
|
|
CitadelStationBot
|
e9f626dd59
|
Automatic changelog generation for PR #10600 [ci skip]
|
2020-01-18 11:52:17 -06: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 |
|
|
CitadelStationBot
|
f1ea68c977
|
Automatic changelog generation for PR #10580 [ci skip]
|
2020-01-18 10:47:34 -06:00 |
|
|
Ghom
|
07b3bac674
|
Merge pull request #10580 from Putnam3145/craft-log
Craft logging
|
2020-01-18 17:47:31 +01:00 |
|
|
CitadelStationBot
|
bbe5b0e281
|
Automatic changelog generation for PR #10586 [ci skip]
|
2020-01-18 10:42:32 -06:00 |
|
|
Ghom
|
c00be1a9b1
|
Merge pull request #10586 from Tupinambis/RLDNerf
Nerfs RLDs because they hard counter nightmares and night ops.
|
2020-01-18 17:42:30 +01:00 |
|
|
Ghom
|
29c3e72335
|
You jelly.
|
2020-01-18 17:41:31 +01:00 |
|
|
CitadelStationBot
|
c7907e9173
|
Automatic changelog generation for PR #10481 [ci skip]
|
2020-01-18 09:56:34 -06:00 |
|
|
Ghom
|
0a1277c28f
|
Merge pull request #10481 from dapnee/BEEES
Updates Science Uniform and Accessories
|
2020-01-18 16:56:31 +01:00 |
|
|
CitadelStationBot
|
ea3d6a1977
|
Automatic changelog generation for PR #10599 [ci skip]
|
2020-01-18 09:54:55 -06:00 |
|
|
Ghom
|
5a613809f5
|
Merge pull request #10599 from Putnam3145/gibtonite-explosion-fix
Fixed gibtonite instantly exploding on pick mining
|
2020-01-18 16:54:52 +01: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
|
b30948a60a
|
Fixed gibtonite instantly exploding on pick mining
|
2020-01-18 04:37:44 -08:00 |
|
|
Dap
|
c13a5687d6
|
HOW MANY TIMES DO I GOTTA SCREAM AT YOU TO MERGE THIS OLD MAN
|
2020-01-18 02:53:03 -07:00 |
|
|
Dap
|
28c9700308
|
Merge remote-tracking branch 'upstream/master' into BEEES
|
2020-01-18 02:27:15 -07:00 |
|
|
Putnam
|
6d4f400f5c
|
updated the tgui file for the conflict
|
2020-01-17 21:34:41 -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 |
|
|
r4d6
|
0d3706b7f9
|
Make public shuttle not require access
|
2020-01-17 22:15:29 -05:00 |
|
|
r4d6
|
4e114d399c
|
Readding Cryo Sleeper in the gulag
|
2020-01-17 22:13:19 -05: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 |
|
|
CitadelStationBot
|
61804e4147
|
Automatic changelog generation for PR #10579 [ci skip]
|
2020-01-17 18:32:32 -06:00 |
|
|
Ghom
|
f848b58f2c
|
Merge pull request #10579 from r4d6/map-fix
Fix Cyborgs spawns on all maps
|
2020-01-18 01:32:29 +01:00 |
|
|
CitadelStationBot
|
201f234364
|
Automatic changelog generation for PR #10591 [ci skip]
|
2020-01-17 18:25:37 -06: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
|
eaff51ff40
|
Kevinz let some files fall back to CRLF.
|
2020-01-17 23:26:05 +01:00 |
|
|
CitadelStationBot
|
eb3597ecc3
|
Automatic changelog generation for PR #10125 [ci skip]
|
2020-01-17 16:15:12 -06: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 |
|
|
CitadelStationBot
|
32c496f70e
|
Automatic changelog generation for PR #10570 [ci skip]
|
2020-01-17 15:34:40 -06: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 |
|
|
CitadelStationBot
|
7c3d671eb1
|
Automatic changelog generation for PR #10569 [ci skip]
|
2020-01-17 15:24:15 -06: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 |
|