Commit Graph

13931 Commits

Author SHA1 Message Date
Ghommie
33687dc2bc I'm an idiot, I need to pick an element within the list, not the list itself!! 2019-07-01 22:53:42 +02:00
Ghommie
d0a001f663 Quickfixing latejoin ghost roles, I'm sorry. 2019-07-01 22:47:51 +02:00
Trilbyspaceclone
88c01dd521 I need to take a brake 2019-07-01 16:47:50 -04:00
Ghommie
8c1e6ff66a Thanks for pointing that out, lolman. 2019-07-01 09:24:35 +02:00
Ghommie
70dc9b9122 fomatting. 2019-06-30 22:37:48 +02:00
Sishen
f55ef6a755 Update thermomachine.dm 2019-06-30 16:10:54 -04:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
TrilbySpaceClone
9d6c930b2c owo
Wat dis?
2019-06-30 15:47:45 -04:00
Sishen
b2d5ec8d0c Update action_button.dm 2019-06-30 15:42:04 -04:00
Sishen
2047d86095 Update emitter.dm 2019-06-30 15:33:34 -04:00
Sishen
b263c37a70 mech counterplay ahoy 2019-06-30 13:19:17 -04:00
Ghommie
595398d76e yea 2019-06-30 17:47:35 +02:00
Ghommie
831c91fce2 Fixes the uplink category indexing. 2019-06-30 17:43:34 +02:00
Ghommie
c569da5713 Fixes PDA skin preference not saving up. 2019-06-30 17:17:23 +02:00
kevinz000
4d39d28f74 Update output.dm 2019-06-30 03:55:03 -07:00
deathride58
4b83110db7 fuck copypasta; Fixes master not compiling. Stop blindly copy-pasting shit from other codebases without even so much as making sure it compiles. Holy fuck. 2019-06-30 05:02:51 -04:00
deathride58
1efd1b2634 oh, and lets add a length check real quick to make sure the sleeper actually has shit in it 2019-06-30 04:35:34 -04:00
deathride58
cb5ed2d2cd Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers with a crowbar 2019-06-30 04:29:48 -04:00
kevinz000
cef22b3c5a Merge pull request #8786 from Sishen1542/jetpacc
Update jetpack.dm
2019-06-29 22:17:00 -07:00
Sishen
575f70f3b2 Update jetpack.dm 2019-06-30 01:13:37 -04:00
kevinz000
be377c4bda Merge pull request #8779 from Sishen1542/jetpacc
Nerfs roundstart carbon jetpacks. TAKE TWO
2019-06-29 20:09:33 -07:00
kevinz000
09c8a45fe2 Merge pull request #8770 from Arturlang/Carp_Deflecting
Carp now deflects the bullets instead of making them dissapear.
2019-06-29 20:08:47 -07:00
TrilbySpaceClone
688fabfffc Honk 2019-06-29 21:03:38 -04:00
Ghommie
dc20b605fb Fixing some emergency pod storage refactor fuck ups. 2019-06-30 00:40:39 +02:00
Sishen
3aaed75a95 Update smelting_designs.dm 2019-06-29 04:49:29 -04:00
Ghommie
ad3b709c40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97 2019-06-29 06:39:21 +02:00
Sishen
97241cd1e8 jetpacks, take 2 2019-06-29 00:29:49 -04:00
Ghommie
0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
kevinz000
fbbfb02364 Merge pull request #8681 from Ghommie/Ghommie-cit64
Fixes vape and its sprites
2019-06-28 20:36:43 -07:00
kevinz000
c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
2019-06-28 20:32:15 -07:00
kevinz000
a6caf4c63f Merge pull request #8729 from Ghommie/Ghommie-cit79
Ports "Removes SSreligion"
2019-06-28 20:30:44 -07:00
kevinz000
7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42
[Ready]Reskinnable PDAs.
2019-06-28 20:30:05 -07:00
Trilbyspaceclone
75fa9d633c Update autolathe_designs_tools.dm 2019-06-28 21:56:17 -04:00
Ghommie
06ce8c6245 I thought I commited these already. turns out I were wrong. 2019-06-28 23:30:19 +02:00
Ghommie
d93e63af53 we just want the trauma to be niche, not unachievable. 2019-06-28 23:21:10 +02:00
Ghommie
3291b9c47a Porting in donut fixes, beepsky smash and Neurotoxin reworks. 2019-06-28 23:17:12 +02:00
deathride58
7e943c0f42 Merge pull request #8737 from Ghommie/Ghommie-cit85
Fixes CWC construct shells being visible as ghost role to latejoiners.
2019-06-28 16:03:53 -04:00
Ghommie
f210e79f3f Slight tweaks to the crew monitor indexing. 2019-06-28 19:47:19 +02:00
kevinz000
d4b9b52f10 Merge pull request #8728 from Sishen1542/JESUSFUCKFIXDISPENSERSALREADYGODDAMN
Dispensers now act like tg counterparts! Tweak to available chems in chem/soda/booze dispensers.
2019-06-28 10:16:25 -07:00
Ghommie
d782f24395 change 2019-06-28 17:30:28 +02:00
Ghommie
513f0af0fa turns out the curator cartridge already had an (unused) sprite. 2019-06-28 17:14:57 +02:00
Sishen
1459ada045 adds customization options for podweak 2019-06-28 10:22:09 -04:00
Sishen
92f530eed1 left the , for diethyl when i removed saltpetre whoops 2019-06-28 08:34:35 -04:00
Sishen
84e60b1cd2 Update chem_dispenser.dm 2019-06-28 08:32:56 -04:00
kevinz000
6c77443887 Merge pull request #8720 from Ghommie/Ghommie-cit76
Sort of porting MRE rations from Yogstation.
2019-06-28 05:28:35 -07:00
kevinz000
8a2a0100c5 Merge pull request #8772 from Sishen1542/bibleblack
quick bible fix, per kevinz request
2019-06-28 05:27:43 -07:00
kevinz000
83f84b01a1 Merge pull request #8700 from Sishen1542/trenchcloak
Adds a reskin option for HoS tenchcoat, the trenchcloak!
2019-06-28 05:24:11 -07:00
Sishen
555c1adf67 fix per kevs request 2019-06-28 08:20:59 -04:00
kevinz000
f7bbca8918 Merge pull request #8731 from Ghommie/Ghommie-cit81
Ports in microwave updates and its radial menu.
2019-06-28 05:19:04 -07:00
kevinz000
f76737dc04 Merge pull request #8708 from Trilbyspaceclone/patch-185
Corrects the "Durasteel" to be plastitanium tool boxes
2019-06-28 05:18:35 -07:00