This website requires JavaScript.
2047d86095
Update emitter.dm
2019-06-30 15:33:34 -04:00
4256e4414b
Update custom_items.dm
2019-06-30 14:47:07 -04:00
933851eb12
Update __donator.dm
2019-06-30 14:42:32 -04:00
937d6467e6
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
2019-06-30 19:16:27 +01:00
b263c37a70
mech counterplay ahoy
2019-06-30 13:19:17 -04:00
595398d76e
yea
2019-06-30 17:47:35 +02:00
831c91fce2
Fixes the uplink category indexing.
2019-06-30 17:43:34 +02:00
c569da5713
Fixes PDA skin preference not saving up.
2019-06-30 17:17:23 +02:00
4d39d28f74
Update output.dm
2019-06-30 03:55:03 -07:00
e6578fddad
Merge pull request #8791 from deathride58/fuckcopypasta
2019-06-30 02:06:28 -07:00
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
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
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
cef22b3c5a
Merge pull request #8786 from Sishen1542/jetpacc
2019-06-29 22:17:00 -07:00
575f70f3b2
Update jetpack.dm
2019-06-30 01:13:37 -04:00
796b620efe
Automatic changelog generation for PR #8784 [ci skip]
2019-06-29 22:25:04 -05:00
e8ae3eb303
Merge pull request #8784 from Trilbyspaceclone/donor_130208120381
2019-06-29 22:25:02 -05:00
ee6b51603c
Automatic changelog generation for PR #8779 [ci skip]
2019-06-29 22:09:35 -05:00
be377c4bda
Merge pull request #8779 from Sishen1542/jetpacc
2019-06-29 20:09:33 -07:00
09c8a45fe2
Merge pull request #8770 from Arturlang/Carp_Deflecting
2019-06-29 20:08:47 -07:00
538e0fad29
Oops
2019-06-30 02:06:30 +01:00
688fabfffc
Honk
2019-06-29 21:03:38 -04:00
e09f189895
WELCOME TO PH'S HELL RIDE
2019-06-30 01:56:10 +01:00
5087b97e18
Trending spriter
2019-06-29 20:18:32 -04:00
dc20b605fb
Fixing some emergency pod storage refactor fuck ups.
2019-06-30 00:40:39 +02:00
8e88fecf08
Automatic changelog generation for PR #8742 [ci skip]
2019-06-29 17:18:03 -05:00
bf6811b981
Merge pull request #8742 from Trilbyspaceclone/MW2_suit
2019-06-29 15:18:01 -07:00
696d879874
Merge branch 'master' into master
2019-06-29 15:48:25 +01:00
3aaed75a95
Update smelting_designs.dm
2019-06-29 04:49:29 -04:00
7be7f05228
Reduced pent, tweaked pH, tweaked MK, added beaker tally.
2019-06-29 08:50:20 +01:00
f8a93a035f
Tweaking pH based on user feedback.
2019-06-29 07:32:00 +01:00
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
97241cd1e8
jetpacks, take 2
2019-06-29 00:29:49 -04:00
0371a5513a
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-06-29 06:03:57 +02:00
c3ae7e5522
Automatic changelog generation for PR #8681 [ci skip]
2019-06-28 22:36:45 -05:00
fbbfb02364
Merge pull request #8681 from Ghommie/Ghommie-cit64
2019-06-28 20:36:43 -07:00
43ca342d45
Automatic changelog generation for PR #8739 [ci skip]
2019-06-28 22:32:17 -05:00
c495a2aa47
Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
2019-06-28 20:32:15 -07:00
d15892c99a
Automatic changelog generation for PR #8729 [ci skip]
2019-06-28 22:30:46 -05:00
a6caf4c63f
Merge pull request #8729 from Ghommie/Ghommie-cit79
2019-06-28 20:30:44 -07:00
c199c9abb9
Automatic changelog generation for PR #8581 [ci skip]
2019-06-28 22:30:08 -05:00
7e1522b76b
Merge pull request #8581 from Ghommie/Ghommie-cit42
2019-06-28 20:30:05 -07:00
44337c6a08
Forgot to update lists when removing all sizes from GLOB.
2019-06-29 03:16:54 +01:00
75fa9d633c
Update autolathe_designs_tools.dm
2019-06-28 21:56:17 -04:00
b6309d5a31
Fixes explosion bug, tweaks hypo and fiddles pH.
2019-06-29 02:47:32 +01:00
06ce8c6245
I thought I commited these already. turns out I were wrong.
2019-06-28 23:30:19 +02:00
d93e63af53
we just want the trauma to be niche, not unachievable.
2019-06-28 23:21:10 +02:00
3291b9c47a
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
2019-06-28 23:17:12 +02:00
77ed7c6428
Automatic changelog generation for PR #8737 [ci skip]
2019-06-28 15:03:55 -05:00
7e943c0f42
Merge pull request #8737 from Ghommie/Ghommie-cit85
2019-06-28 16:03:53 -04:00
a4edb0b69a
Trying alternative fix for pH.
2019-06-28 18:50:28 +01:00
f210e79f3f
Slight tweaks to the crew monitor indexing.
2019-06-28 19:47:19 +02:00
ccf64fe9c9
fix per ghoms request
2019-06-28 13:16:52 -04:00
48d358d364
Automatic changelog generation for PR #8728 [ci skip]
2019-06-28 12:16:27 -05:00
d4b9b52f10
Merge pull request #8728 from Sishen1542/JESUSFUCKFIXDISPENSERSALREADYGODDAMN
2019-06-28 10:16:25 -07:00
b8028242c0
Compile fixes
2019-06-28 17:16:21 +01:00
6590b07b32
Update runes.dm
2019-06-28 12:01:00 -04:00
9ee17e4045
[TEST] redo pH on reaction.
2019-06-28 16:58:08 +01:00
4b7ac0be79
More fun ssblackbox tallies.
2019-06-28 16:50:48 +01:00
d782f24395
change
2019-06-28 17:30:28 +02:00
db0d1ae565
Applying requested changes.
2019-06-28 17:25:47 +02:00
513f0af0fa
turns out the curator cartridge already had an (unused) sprite.
2019-06-28 17:14:57 +02:00
1459ada045
adds customization options for podweak
2019-06-28 10:22:09 -04:00
92f530eed1
left the , for diethyl when i removed saltpetre whoops
2019-06-28 08:34:35 -04:00
84e60b1cd2
Update chem_dispenser.dm
2019-06-28 08:32:56 -04:00
bd4ba5da88
Automatic changelog generation for PR #8720 [ci skip]
2019-06-28 07:28:37 -05:00
6c77443887
Merge pull request #8720 from Ghommie/Ghommie-cit76
2019-06-28 05:28:35 -07:00
8a2a0100c5
Merge pull request #8772 from Sishen1542/bibleblack
2019-06-28 05:27:43 -07:00
83f84b01a1
Merge pull request #8700 from Sishen1542/trenchcloak
2019-06-28 05:24:11 -07:00
555c1adf67
fix per kevs request
2019-06-28 08:20:59 -04:00
1679a2c42b
Merge remote-tracking branch 'upstream/master'
2019-06-28 08:20:12 -04:00
1386161aff
Revert "Revert "Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]""""
2019-06-28 08:20:06 -04:00
3fcc884ab5
Revert "Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]"""
2019-06-28 08:19:49 -04:00
e336f2db52
Automatic changelog generation for PR #8731 [ci skip]
2019-06-28 07:19:06 -05:00
f7bbca8918
Merge pull request #8731 from Ghommie/Ghommie-cit81
2019-06-28 05:19:04 -07:00
a55a0b32ab
Automatic changelog generation for PR #8708 [ci skip]
2019-06-28 07:18:37 -05:00
f76737dc04
Merge pull request #8708 from Trilbyspaceclone/patch-185
2019-06-28 05:18:35 -07:00
a8dfecdf25
Automatic changelog generation for PR #8726 [ci skip]
2019-06-28 07:14:59 -05:00
ee852382f8
Merge pull request #8726 from Sishen1542/biblethump
2019-06-28 05:14:57 -07:00
506b63a9c7
Automatic changelog generation for PR #8760 [ci skip]
2019-06-28 07:12:46 -05:00
a103611d1b
Merge pull request #8760 from Trilbyspaceclone/LoudnProud
2019-06-28 05:12:43 -07:00
33a972529c
Update wheelchair.dm
2019-06-28 04:42:55 -07:00
442c21fdba
For the actual deflecting!
2019-06-28 11:41:01 +03:00
69a62314e9
Defines so carp reroutes the deflects
2019-06-28 11:37:12 +03:00
eb8133cf3b
Defines var
2019-06-28 11:35:00 +03:00
2ecaa57a98
Description so people know it exists
2019-06-28 11:28:37 +03:00
a9d4f53728
Alt-Keys now let you strafe! Wow!
2019-06-28 11:27:35 +03:00
8160da6a6a
Reviewer suggestions
2019-06-28 11:06:33 +03:00
81b9f94511
Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]""
2019-06-28 02:33:42 -04:00
7e9ec43834
Revert "Automatic changelog generation for PR #8738 [ci skip]"
2019-06-28 02:33:23 -04:00
f3712660ce
Automatic changelog generation for PR #8738 [ci skip]
2019-06-27 23:53:25 -05:00
d979dfef59
Merge pull request #8738 from Ghommie/Ghommie-cit86
2019-06-28 00:53:23 -04:00
42025eac1e
Automatic changelog generation for PR #8730 [ci skip]
2019-06-27 23:53:01 -05:00
8f168727c5
Merge pull request #8730 from Ghommie/Ghommie-cit80
2019-06-28 00:52:59 -04:00
11203353e2
Automatic changelog generation for PR #8727 [ci skip]
2019-06-27 23:47:11 -05:00
fb66d382fa
Merge pull request #8727 from Ghommie/Ghommie-cit78
2019-06-28 00:47:09 -04:00
eaef818b94
Automatic changelog generation for PR #8741 [ci skip]
2019-06-27 23:38:29 -05:00
3cd5b1d180
Merge pull request #8741 from Ghommie/Ghommie-cit88
2019-06-28 00:38:27 -04:00
2dc931cad3
Automatic changelog generation for PR #8744 [ci skip]
2019-06-27 23:37:35 -05:00
775bbaba8b
Merge pull request #8744 from Linzolle/fix-1
2019-06-28 00:37:33 -04:00
Sishen