 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 |
|
|
Fermi
|
0d907db516
|
Almost done. Just need to update reagent vars.
|
2019-05-14 21:20:38 +01:00 |
|
|
Fermi
|
76aec5a5ed
|
Holder fixes
|
2019-05-14 16:51:03 +01:00 |
|
|
Sishen
|
afaf15bc59
|
Booty Calls!
Added butt slaps
|
2019-05-14 10:29:04 -04:00 |
|
|
Poojawa
|
77abf6a179
|
just need the stupid component to work properly now
|
2019-05-14 02:36:23 -05:00 |
|
|
deathride58
|
06ea7de46b
|
[S] Fixes a fairly huge vector for server crashes
|
2019-05-13 21:49:33 -04:00 |
|
|
Fermi
|
3229e4bf3a
|
Reverted holder, (sorry Kev)
|
2019-05-14 02:48:12 +01:00 |
|
|
Fermi
|
be27417633
|
Stuff and things
|
2019-05-13 18:07:51 +01:00 |
|
|
Trilbyspaceclone
|
050906bfe8
|
I know how to code I sware
|
2019-05-12 22:22:09 -04:00 |
|
|
Trilbyspaceclone
|
e9a18f156f
|
Update engineering.dm
|
2019-05-12 22:03:21 -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 |
|
|
Poojawa
|
49a2f3cc63
|
I don't even fucking know anymore
|
2019-05-12 06:31:02 -05:00 |
|
|
Poojawa
|
1a047c0068
|
I think I got it.
Also gibs should be better too.
|
2019-05-12 04:06:35 -05:00 |
|
|
Trilbyspaceclone
|
3e4412e171
|
Delete autolathe_designs.dm
|
2019-05-12 02:04:07 -04:00 |
|
|
Trilbyspaceclone
|
62e5037eab
|
Merge branch 'master' into patch-118
|
2019-05-12 02:03:32 -04:00 |
|
|
Trilbyspaceclone
|
db74544a7c
|
Create autolathe_designs.dm
|
2019-05-12 02:02:49 -04: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 |
|
|
Fermi
|
ec2f33ceb5
|
Added Hatmium and a few slight fixes.
|
2019-05-12 03:42:23 +01:00 |
|
|
Trilbyspaceclone
|
2833dab538
|
le sigh
|
2019-05-11 14:49:51 -04:00 |
|
|
Trilbyspaceclone
|
460459a1dd
|
Update craft.dm
|
2019-05-11 14:08:43 -04:00 |
|
|
Trilbyspaceclone
|
1f1926a70e
|
Create machine_designs_all_misc.dm
|
2019-05-11 12:26:56 -04:00 |
|
|
Trilbyspaceclone
|
f47c0786f3
|
Add files via upload
|
2019-05-11 11:42:31 -04:00 |
|
|
Trilbyspaceclone
|
172d56ace5
|
Add files via upload
|
2019-05-11 11:41:56 -04:00 |
|
|
Trilbyspaceclone
|
3a12bab370
|
Delete machine_designs.dm
|
2019-05-11 11:41:20 -04:00 |
|
|
Trilbyspaceclone
|
034a9a0865
|
Delete comp_board_designs.dm
|
2019-05-11 11:41:10 -04:00 |
|
|
Fermi
|
f7655cad25
|
All compiling errors fixed, except for a few weird ones that I need help
|
2019-05-11 15:40:06 +01:00 |
|
|
Thalpy
|
926bd65392
|
Merge branch 'master' into FermiChem
|
2019-05-11 14:14:20 +01:00 |
|
|
Fermi
|
6a17d66323
|
Should be most compiling errors fixed outside of outdated merge problems
|
2019-05-11 14:04:43 +01: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 |
|
|
Fermi
|
6466ef562c
|
100 down, 66 to go.
|
2019-05-11 02:05:25 +01:00 |
|
|
Fermi
|
29d4a2fdde
|
Finished MCchem, now to fix compling errors.
|
2019-05-11 00:14:04 +01:00 |
|
|
Trilbyspaceclone
|
af7b7fc638
|
Update autolathe_designs_medical_and_dinnerware.dm
|
2019-05-10 16:48:52 -04:00 |
|
|
Trilbyspaceclone
|
2885330459
|
commit die
|
2019-05-10 16:30:39 -04:00 |
|
|
Trilbyspaceclone
|
a703b8b85f
|
Yep this works 100% no errors at all!
|
2019-05-10 16:30:01 -04:00 |
|
|
Trilbyspaceclone
|
86e5d96679
|
Update uplink_items.dm
|
2019-05-10 14:55:46 -04:00 |
|