Nero1024
|
2a4a656a4d
|
Port new footsteps from tg
|
2019-05-17 18:10:03 -05:00 |
|
kevinz000
|
844fb13467
|
Merge pull request #8348 from Trilbyspaceclone/patch-123
Makes suitcases craftable
|
2019-05-17 08:36:20 -07:00 |
|
deathride58
|
276a6e9896
|
Merge pull request #8307 from Citadel-Station-13/kevinz000-patch-49
buff sleepy pens to quickly drain stamina after 10 seconds
|
2019-05-17 00:54:17 -04:00 |
|
deathride58
|
cbac4b1daf
|
Merge pull request #8330 from Scorpion-117/master
This is an entire addition to put stargazers back into clock cult.
|
2019-05-17 00:13:35 -04:00 |
|
deathride58
|
d855a7eb0d
|
Merge pull request #8332 from Useroth/collars-n-shit
Two new collar types (with lockable variants). All collars are now colorable a'la polychromic stuff.
|
2019-05-17 00:10:41 -04:00 |
|
CalamaBanana
|
1e7b537166
|
Update code/modules/integrated_electronics/core/detailer.dm
Prettier list
Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com>
|
2019-05-16 00:42:05 +02:00 |
|
CalamaBanana
|
9e00562e68
|
Added custom option
Added custom option to the color selection
|
2019-05-15 13:13:17 +02:00 |
|
Useroth
|
701b01dfa6
|
Just another commit to make travis fucking recompile it
|
2019-05-15 02:30:47 +02:00 |
|
Useroth
|
8500e69088
|
Merge branch 'collars-n-shit' of github.com:Useroth/Citadel-Station-13 into collars-n-shit
|
2019-05-15 02:09:41 +02:00 |
|
Useroth
|
3f64128513
|
Apply suggestions from code review
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-05-15 02:08:43 +02:00 |
|
Useroth
|
6a29a0744b
|
Applied suggested changes.
|
2019-05-15 02:07:16 +02:00 |
|
Useroth
|
f910eea9f8
|
Update code/modules/clothing/neck/_neck.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-05-15 01:41:18 +02:00 |
|
CalamaBanana
|
7cd74e6601
|
Adds pink to the circuit coloring tool
|
2019-05-15 00:07:53 +02:00 |
|
kevinz000
|
a3114d830a
|
Merge pull request #8336 from BurgerLUA/Integrated-Circuit-Fixes-and-Additions
Adds Stun Circuit, Pneumatic Cannon Circuit. Makes Extinguisher and Smoke Reagent circuits work.
|
2019-05-14 13:48:54 -07:00 |
|
deathride58
|
06ea7de46b
|
[S] Fixes a fairly huge vector for server crashes
|
2019-05-13 21:49:33 -04:00 |
|
Trilbyspaceclone
|
41400ff94a
|
Update recipes.dm
|
2019-05-12 21:54:18 -04:00 |
|
Trilbyspaceclone
|
90268dea1d
|
Update recipes.dm
|
2019-05-12 21:17:28 -04:00 |
|
BurgerLua
|
34cb661211
|
Requested changes
|
2019-05-12 13:44:23 -07:00 |
|
kevinz000
|
9f3aa6de13
|
Merge pull request #8316 from Trilbyspaceclone/Lock_and_key
Better Locked Collar checks
|
2019-05-11 22:21:16 -07:00 |
|
kevinz000
|
4f12a762f3
|
Merge pull request #8342 from BurgerLUA/Cult-Improvements-and-Fixes
Adds EMP Defensive Traps to Clockcult
|
2019-05-11 22:19:46 -07:00 |
|
kevinz000
|
db99b595f3
|
Merge pull request #8331 from Useroth/dick-circuits
Dildo-shaped circuit assemblies. Because that's what the community needs.
|
2019-05-11 22:17:46 -07:00 |
|
kevinz000
|
36ee078e23
|
Merge pull request #8333 from Useroth/ayy-baton
Abductor baton buff. Because it currently sucks balls.
|
2019-05-11 22:17:27 -07:00 |
|
kevinz000
|
86e3992945
|
Merge pull request #8335 from Poojawa/quick-fiiiix-marking
Quick fiiiix marking
|
2019-05-11 22:16:37 -07:00 |
|
kevinz000
|
9b135ed56b
|
Merge pull request #8338 from Sishen1542/satchel-holding
Satchel of Holding!
|
2019-05-11 22:14:15 -07:00 |
|
kevinz000
|
4276f53338
|
Merge pull request #8341 from Trilbyspaceclone/golden
Golden toolboxes.
|
2019-05-11 22:13:18 -07:00 |
|
BurgerLua
|
f66326ab51
|
Fixes an potential AI exploit.
|
2019-05-10 19:19:42 -07:00 |
|
BurgerLua
|
4aba11739b
|
Finishing touches.
|
2019-05-10 19:15:42 -07:00 |
|
BurgerLua
|
d97bf47b95
|
Added
|
2019-05-10 18:12:36 -07:00 |
|
Trilbyspaceclone
|
86e5d96679
|
Update uplink_items.dm
|
2019-05-10 14:55:46 -04:00 |
|
Trilbyspaceclone
|
651a452ed0
|
Update recipes.dm
|
2019-05-10 14:50:44 -04:00 |
|
Scorpion-117
|
7a8adff8e0
|
testing a value of 7
x
|
2019-05-10 01:58:53 -06:00 |
|
Scorpion-117
|
9fd61b660d
|
modifying to make it take far more power to produce
x
|
2019-05-10 01:55:25 -06:00 |
|
Sishen
|
c3df1b354e
|
Satchel of holding
fashion creep
|
2019-05-09 20:44:07 -04:00 |
|
BurgerLua
|
6df27ef2a3
|
Updated integrated circuits
|
2019-05-09 15:25:48 -07:00 |
|
Poojawa
|
28eb23d474
|
Fixes prosthetics and missing markings
|
2019-05-09 16:15:03 -05:00 |
|
Useroth
|
83661fff9d
|
Update abduction_gear.dm
|
2019-05-09 13:17:12 +02:00 |
|
Useroth
|
07685a1074
|
Abductor baton buff. Because it currently sucks balls.
|
2019-05-09 12:20:02 +02:00 |
|
Useroth
|
4355584833
|
Added them to loadout too.
|
2019-05-09 12:09:18 +02:00 |
|
Useroth
|
abe8ed16cb
|
A small touch-up.
|
2019-05-09 11:38:33 +02:00 |
|
Useroth
|
1efd7123f2
|
Two new collar types. All collars are now colorable a'la polychromic stuff.
|
2019-05-09 11:22:51 +02:00 |
|
Useroth
|
b80bb21219
|
Dildo-shaped circuit assemblies. Because that's what the community needs.
|
2019-05-09 08:45:47 +02:00 |
|
Scorpion-117
|
e8299db245
|
Readding stargazer
|
2019-05-08 07:44:39 -06:00 |
|
Scorpion-117
|
0c6d84d50e
|
Reading stargazers
because why not
|
2019-05-08 07:29:50 -06:00 |
|
Scorpion-117
|
d0970e327c
|
Update stargazer.dm
|
2019-05-08 07:21:17 -06:00 |
|
Scorpion-117
|
c0717561ff
|
puts back stargazer DM
x
|
2019-05-08 07:20:29 -06:00 |
|
kevinz000
|
a7192734dd
|
Merge pull request #8323 from Trilbyspaceclone/inducer
Makes a new COMBAT inducer! - Admin only
|
2019-05-08 01:34:33 -07:00 |
|
kevinz000
|
1e40a65536
|
buff this a bit
|
2019-05-08 01:31:00 -07:00 |
|
kevinz000
|
55d54592d5
|
Update toxin_reagents.dm
|
2019-05-08 01:30:24 -07:00 |
|
deathride58
|
2b1261ab03
|
Merge pull request #8284 from Citadel-Station-13/kevinz000-patch-44
adds sdql2 new()/instantiation call so it's easier to fill things with cream pies
|
2019-05-07 02:19:40 -04:00 |
|
Trilbyspaceclone
|
ae75bf2fd1
|
Update autolathe_designs.dm
|
2019-05-06 23:46:31 -04:00 |
|