Commit Graph

20935 Commits

Author SHA1 Message Date
Trilbyspaceclone
874a2a1377 Update tgstation.dme 2019-06-05 20:13:07 -04:00
Trilbyspaceclone
9443f5bf71 Add files via upload 2019-06-05 20:11:54 -04:00
Trilbyspaceclone
a9ded7a3eb Add files via upload 2019-06-05 20:10:07 -04:00
Trilbyspaceclone
e5b538af71 Update recipes_frozen.dm 2019-06-05 20:09:21 -04:00
Trilbyspaceclone
762c509315 Update craft.dm 2019-06-05 20:07:25 -04:00
Trilbyspaceclone
7f8886f6e9 Update construction.dm 2019-06-05 20:06:37 -04:00
Trilbyspaceclone
b7a759017d Add files via upload 2019-06-05 20:05:56 -04:00
Trilbyspaceclone
9b2991d0f2 Update recipes_misc.dm 2019-06-05 20:05:22 -04:00
Trilbyspaceclone
e922a0cb18 Update recipes_sandwich.dm 2019-06-05 20:04:40 -04:00
Trilbyspaceclone
b68565280e Update snacks_other.dm 2019-06-05 20:02:22 -04:00
CitadelStationBot
b9aebf69b1 Automatic changelog generation for PR #8525 [ci skip] 2019-06-05 13:35:25 -05:00
kevinz000
7decce3808 Merge pull request #8525 from Trilbyspaceclone/patch-161
Makes cookies loved by all
2019-06-05 11:35:22 -07:00
CitadelStationBot
3eb217b063 Automatic changelog generation for PR #8430 [ci skip] 2019-06-05 13:31:14 -05:00
kevinz000
0d97361dea Merge pull request #8430 from Trilbyspaceclone/bad_idea
Adds improvised 7.62 rifle
2019-06-05 11:31:10 -07:00
kevinz000
6e4a3c71f9 Merge pull request #8532 from Poojawa/WHYBYOND
Without this, everyone is broken
2019-06-05 11:30:09 -07:00
CitadelStationBot
057107da3b Automatic changelog generation for PR #8424 [ci skip] 2019-06-05 11:54:39 -05:00
deathride58
98304e4975 Merge pull request #8424 from Arturlang/CTRL-Alt-Click-port
Ctrl Alt Click on pipes, port from TG
2019-06-05 12:54:36 -04:00
Poojawa
27ef3ce281 Without this, everyone is broken 2019-06-05 08:10:20 -05:00
CitadelStationBot
d44aa44ec6 Automatic changelog generation for PR #8528 [ci skip] 2019-06-05 04:02:43 -05:00
kevinz000
2c84d75ae6 Merge pull request #8528 from Poojawa/marking-mysteries
Fixes prosthetic invisible hands, improves female markings
2019-06-05 02:02:40 -07:00
kevinz000
4dcef2b618 Merge pull request #8472 from Sishen1542/Crewmonitors
Boxstation Crew Monitor
2019-06-05 01:59:19 -07:00
CitadelStationBot
ecef40258b Automatic changelog generation for PR #8387 [ci skip] 2019-06-05 03:55:21 -05:00
kevinz000
980c48180c Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
2019-06-05 01:55:19 -07:00
CitadelStationBot
962afa97bc Automatic changelog generation for PR #8516 [ci skip] 2019-06-05 03:53:37 -05:00
kevinz000
cc2d3a7f10 Merge pull request #8516 from Ghommie/Ghommie-cit26
Makes clockwork wall - sonic jackhammer interaction account the wall's superheating.
2019-06-05 01:53:34 -07:00
CitadelStationBot
055396d110 Automatic changelog generation for PR #8491 [ci skip] 2019-06-05 03:52:19 -05:00
kevinz000
89bf36e6a9 Merge pull request #8491 from Ghommie/Ghommie-cit24
zero, , null, and empty text strings, all fulfill the ! operator.
2019-06-05 01:52:17 -07:00
CitadelStationBot
65e2d1d37c Automatic changelog generation for PR #8489 [ci skip] 2019-06-05 03:49:59 -05:00
kevinz000
3ab46405b8 Merge pull request #8489 from Coolgat3/tacticalwear
Makes combat gloves look T A C T I C O O L
2019-06-05 01:49:57 -07:00
CitadelStationBot
f18943387f Automatic changelog generation for PR #8504 [ci skip] 2019-06-05 03:49:13 -05:00
kevinz000
98491cd2f8 Merge pull request #8504 from Trilbyspaceclone/patch-160
buffs resonator
2019-06-05 01:49:11 -07:00
CitadelStationBot
8dc5619369 Automatic changelog generation for PR #8506 [ci skip] 2019-06-05 03:44:07 -05:00
kevinz000
cd38a29449 Merge pull request #8506 from CalamaBanana/Elf-Ears-and-Deer-taurs-for-mammals
Ports RP's deer taur and adds Elven ears to mammals
2019-06-05 01:44:05 -07:00
CitadelStationBot
1eef9b39e3 Automatic changelog generation for PR #8517 [ci skip] 2019-06-05 03:42:50 -05:00
kevinz000
adbbb2944a Merge pull request #8517 from Poojawa/shitcode-is-so-bad-and-people-like-it-I-guess
Adds visible balls and multi-breasts
2019-06-05 01:42:48 -07:00
CitadelStationBot
73fe37ada0 Automatic changelog generation for PR #8518 [ci skip] 2019-06-05 03:41:25 -05:00
kevinz000
102d68a243 Merge pull request #8518 from Ghommie/Ghommie-cit27
Fixes and updates pod's emergency suits storage.
2019-06-05 01:41:23 -07:00
kevinz000
52b189dc98 Merge pull request #8502 from Sishen1542/meatyors
Meteor Sats not exclusive to station goal
2019-06-05 01:40:50 -07:00
CitadelStationBot
60ab3b54d5 Automatic changelog generation for PR #8524 [ci skip] 2019-06-05 03:40:31 -05:00
kevinz000
58bdac6965 Merge pull request #8524 from BurgerLUA/Ass-Blast-USA
Adds a trait that makes you immune to ass slapping: BUNS OF STEEL.
2019-06-05 01:40:28 -07:00
kevinz000
81ba2011d3 Merge pull request #8510 from Sishen1542/ghostmanbad
Subtle 2: No Ghost Boogaloo
2019-06-05 01:32:42 -07:00
Poojawa
a2b4f4261c Fixes missing hands and marking overlap
cleans up the code a bit too. Improves female chest sprites.
2019-06-05 02:33:25 -05:00
Poojawa
b053fe3c86 Probably fixes synth hand issues 2019-06-04 23:36:58 -05:00
Poojawa
b175150719 fixes missing chest markings 2019-06-04 23:27:33 -05:00
Trilbyspaceclone
7fb1f7fba1 Update snacks_pastry.dm 2019-06-03 18:38:55 -04:00
CitadelStationBot
5d397fafda Automatic changelog generation for PR #8515 [ci skip] 2019-06-03 16:51:15 -05:00
deathride58
b95b14d033 Merge pull request #8515 from Ghommie/Ghommie-cit25
Fixes stunbatons' icons not properly updating on cell fiddling, plus cell maxcharge leniency.
2019-06-03 17:51:13 -04:00
BurgerLua
ed7d0575b2 Ass Blast USA 2019-06-03 14:40:57 -07:00
kevinz000
fc1611d86a Merge pull request #8426 from Sishen1542/sloom-hnngh
Slimespeak!
2019-06-03 00:51:36 -07:00
Ghommie
472d7ef8cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27 2019-06-02 19:03:34 +02:00