Commit Graph

21821 Commits

Author SHA1 Message Date
kevinz000
570fa0cd3b fix 2019-07-14 03:53:15 -07:00
kevinz000
30a006e42f additions, and it now nulls out. 2019-07-08 18:21:04 -07:00
kevinz000
270cdb1c43 CE memes 2019-07-08 12:35:21 -07:00
kevinz000
adf2166c57 t 2019-07-08 12:31:15 -07:00
kevinz000
d61732472c Merge pull request #8831 from Ghommie/Ghommie-cit115
Holographic PDA Quickfix!
2019-07-07 11:08:15 -07:00
CitadelStationBot
423a4bc169 Automatic changelog generation for PR #8819 [ci skip] 2019-07-07 04:44:35 -05:00
kevinz000
a9738e0790 Merge pull request #8819 from Sishen1542/publiclathe
All maps in rotation now have a public autolathe.
2019-07-07 02:44:32 -07:00
CitadelStationBot
38903fcecc Automatic changelog generation for PR #8802 [ci skip] 2019-07-07 04:39:10 -05:00
kevinz000
1b4df74efb Merge pull request #8802 from Ghommie/Ghommie-cit101
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
2019-07-07 02:39:07 -07:00
CitadelStationBot
abbc4db7e0 Automatic changelog generation for PR #8800 [ci skip] 2019-07-07 04:35:14 -05:00
kevinz000
6e5ec4594c Merge pull request #8800 from Sishen1542/freeza
Adds click interactions  to atmos heater/freezer
2019-07-07 02:35:12 -07:00
CitadelStationBot
2a34029717 Automatic changelog generation for PR #8825 [ci skip] 2019-07-07 04:34:49 -05:00
kevinz000
e227d5575c Merge pull request #8825 from Ghommie/Ghommie-cit110
Ports "Fixes default supplypods exploding their contents" & co.
2019-07-07 02:34:47 -07:00
kevinz000
91f114f717 Merge pull request #8832 from Ghommie/Ghommie-cit116
Fixes new player runtime that makes people unable to join rounds.
2019-07-07 02:33:32 -07:00
CitadelStationBot
5d861581d7 Automatic changelog generation for PR #8826 [ci skip] 2019-07-07 04:32:58 -05:00
kevinz000
9d13576cc9 Merge pull request #8826 from Ghommie/Ghommie-cit111
Ports "Adds safer helper for alt-click turf listing"
2019-07-07 02:32:56 -07:00
CitadelStationBot
8e6bb27909 Automatic changelog generation for PR #8824 [ci skip] 2019-07-07 04:31:28 -05:00
kevinz000
6944725cfb Merge pull request #8824 from Ghommie/Ghommie-cit109
Ports "Fixes damp rag not smothering people"
2019-07-07 02:31:26 -07:00
CitadelStationBot
de310551b6 Automatic changelog generation for PR #8827 [ci skip] 2019-07-07 04:31:12 -05:00
kevinz000
fd592e5815 Merge pull request #8827 from Ghommie/Ghommie-cit112
Ports "Makes looping sounds use client time"
2019-07-07 02:31:10 -07:00
Ghommie
fe2abc990b Fixes new player runtime that makes people unable to join rounds. 2019-07-06 04:51:56 +02:00
Ghommie
00879a6e28 Holographic PDA Quickfix! 2019-07-06 03:46:01 +02:00
deathride58
bd675d3bae Merge pull request #8808 from Citadel-Station-13/singerydonator
Yellow Outfit - Donator [T2]
2019-07-05 18:00:42 -04:00
LetterJay
a17b4ff953 Merge branch 'master' into singerydonator 2019-07-05 14:31:31 -05:00
CitadelStationBot
01c2d96e34 Automatic changelog generation for PR #8632 [ci skip] 2019-07-05 08:57:52 -05:00
kevinz000
748550895d Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight
Ports traitor codeword highlighting
2019-07-05 06:57:49 -07:00
CitadelStationBot
7b8a9cdf4c Automatic changelog generation for PR #8805 [ci skip] 2019-07-05 08:56:49 -05:00
kevinz000
757b85b7b0 Merge pull request #8805 from Linzolle/fix-2
fixes some displays being on the ground
2019-07-05 06:56:47 -07:00
CitadelStationBot
8c2d3c3d6d Automatic changelog generation for PR #8794 [ci skip] 2019-07-05 08:56:24 -05:00
kevinz000
77743c9a0f Merge pull request #8794 from Ghommie/Ghommie-cit100
Fixes the uplink category indexing.
2019-07-05 06:56:22 -07:00
CitadelStationBot
ec8f9cd186 Automatic changelog generation for PR #8663 [ci skip] 2019-07-05 08:55:51 -05:00
kevinz000
231e0170a9 Merge pull request #8663 from Ghommie/Ghommie-cit58
Peanuts, peanut butter, and PB&J sandwiches.
2019-07-05 06:55:49 -07:00
CitadelStationBot
2af8ce22e3 Automatic changelog generation for PR #8790 [ci skip] 2019-07-05 08:55:20 -05:00
kevinz000
7544748570 Merge pull request #8790 from deathride58/pryablesleepers
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar
2019-07-05 06:55:18 -07:00
kevinz000
7aa6716024 Merge pull request #8815 from Sishen1542/b
adds a 🅱
2019-07-05 06:54:28 -07:00
Ghommie
3c2e03c247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58 2019-07-04 23:46:04 +02:00
Ghommie
7be9305b03 Ports "Makes looping sounds use client time" 2019-07-04 22:50:11 +02:00
Ghommie
5ff8be0faa Ports "Adds safer helper for alt-click turf listing" 2019-07-04 22:42:51 +02:00
Ghommie
b41e289db3 Ports "Fixes default supplypods exploding their contents" & co. 2019-07-04 22:35:13 +02:00
Ghommie
37cf41a3bb Ports "Fixes damp rag not smothering people" 2019-07-04 22:06:16 +02:00
LetterJay
678a08e883 Update modular_citadel/code/modules/client/loadout/__donator.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-07-04 14:23:37 -05:00
Sishen
e5cd1bd7c2 Update thermomachine.dm 2019-07-03 17:46:05 -04:00
Sishen
4fa244e8e4 Update thermomachine.dm 2019-07-03 17:41:27 -04:00
Sishen
9e514bfab5 Update thermomachine.dm 2019-07-03 17:39:41 -04:00
Sishen
df75f9f289 Update thermomachine.dm 2019-07-03 17:38:19 -04:00
Sishen
e76954455c fixed lathes 2019-07-03 17:21:05 -04:00
Linzolle
84f0554fc1 ai display was on the ground too 2019-07-03 16:02:53 -05:00
Sishen
a9f5b99510 Update thermomachine.dm 2019-07-03 16:55:14 -04:00
CitadelStationBot
a814442fa5 Automatic changelog generation for PR #8768 [ci skip] 2019-07-03 15:47:55 -05:00
kevinz000
ba74189192 Merge pull request #8768 from Ghommie/Ghommie-cit94
New sprites for the some pda cartridges.
2019-07-03 13:47:53 -07:00