shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,151 Commits 5 Branches 0 Tags
32fb136bf00a970f8b1bed31182e5202a4e0b330
Commit Graph

129 Commits

Author SHA1 Message Date
ShizCalev
af71944d71 Fixes xenobio sentience giving the wrong name (#32016) 2017-10-24 00:04:33 -05:00
LetterJay
d7ee78ec0d Update xenobiology.dm 2017-10-23 01:27:54 -05:00
YPOQ
60e45814ab Removes golem rune code 2017-10-23 00:10:47 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
Emmett Gaines
24b9d4b9f4 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 17:40:34 -05:00
LetterJay
d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920) 
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
 2017-10-10 13:13:38 -05:00
kevinz000
a6ac800db0 Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser (#31399) 
* precision

* precision

* sanity checks

* itt kevinz doesn't know how cyberboss procs work

* fixes

* allows user cancellation

* im dumb

* itt: im still dumb

* fixes stuff, makes it set on init

* refactors reagentgrinder code

* more fixes, prevents melee attacks from going anyways

* ...? wtf is with usetopic

* Finally found out what's wrongw ith this thing.

* fixes a mistake
 2017-10-10 03:11:50 -05:00
LetterJay
f046f4f15b Merge pull request #3225 from Citadel-Station-13/upstream-merge-31413 
[MIRROR] Removes useless commented-out what-if code from the 1970s
 2017-10-08 16:22:10 -04:00
Jordan Brown
58fd7f2067 Merge pull request #31413 from vuonojenmustaturska/codejanitoring 
Removes useless commented-out what-if code from the 1970s
 2017-10-08 10:00:34 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay
89ab9a0fd7 Update rdconsole.dm 2017-10-06 22:24:24 -05:00
kevinz000
6a4fb2b26a actually fixes the exploit this time 2017-10-06 20:38:53 -05:00
WewLads
7f77e08c0b Changed OneHuman to OneCrew lawset (#3172) 
* You can now slap butts

Disarm Intent + Target Groin = Butt Slap. Deals 1 damage to both the
victim's torso and the target's active hand.

* Fixed the drying rack

* Changes OneCrew to OneHuman

* Revert "Changes OneCrew to OneHuman"

This reverts commit 34e2ae378acff838013ed9c15ff85901740e9cdd.

* Revert "Revert "Changes OneCrew to OneHuman""

This reverts commit bc0f46d387ff7cd621b5331ad4d916f4a49ff2f0.

* Revert "Changes OneCrew to OneHuman"

This reverts commit 34e2ae378acff838013ed9c15ff85901740e9cdd.

* Changed OneHuman to OneCrew

* Revert "Fixed the drying rack"

This reverts commit 1351e2f38ed819b734a558fbeb9ef839cddf2b8f.

* Revert "You can now slap butts"

This reverts commit 9b1d6808d8e24cc9b2f5d28384b3ffe633d811fe.
 2017-10-06 11:36:52 -07:00
Kevak
f4ce4a3a27 Shock Collars Are Now A Thing. 
Exactly what it says on the tin.
 2017-10-03 08:03:03 -07:00
bawhoppen
82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
kevinz000
724fa8ce54 [READY]Refactors timestops to use fields (#30858) 
* kek

* fixes

* Fixes

* fixes

* throw freeze

* woops

* double woops
 2017-09-28 21:46:34 -05:00
CitadelStationBot
6efb76fad5 [MIRROR] Ammo cleanup (#2643) 
* Ammo cleanup

* Update briefcase.dm

* Update manned_turret.dm

* Update mime.dm

* Update manned_turret.dm

* Update manned_turret.dm

* fixes

* mime memes
 2017-09-22 22:30:44 -05:00
CitadelStationBot
0925853992 [MIRROR] [S] fixes sentience potions working through cams (#2896) 
* Fixes sentience potions working through cams (#30914)

* [S] fixes sentience potions working through cams
 2017-09-22 19:00:07 -05:00
Poojawa
573a81a4d9 Reapplies material componets 2017-09-22 09:31:39 -05:00
CitadelStationBot
4bc6e9d522 [MIRROR] Cleaned up some decimal values. (#2797) 
* Cleaned up some decimal values.

* Update gas_mixture.dm

* Update color.dm

* Update medsci.dm
 2017-09-18 01:45:39 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
LetterJay
01b0e754c2 Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531 
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
 2017-09-12 02:35:17 -05:00
Firecage
1e0297f9ef Adds cybernetic lungs(and an upgraded and actually useful variety) to the game. (#30382) 
* Adds cybernetic lungs

* Added better cold thresholds to the upgraded cybernetic lungs. Heat threshold remains the same though for balance reasons.

* Adds an EMP effect to cybernetic lungs.
 2017-09-10 14:31:47 -05:00
Kerbin-Fiber
d158ec9528 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter 2017-09-10 03:43:09 -05:00
Poojawa
5f1d88ffeb Revert "[MIRROR] Port material containers to datum components" (#2597) 
* Revert "sprite fix on kitsune tails"

This reverts commit 44d5b21a43.

* Revert "Update vg_clothing_packs.dm (#2591)"

This reverts commit 7f46280d6b.

* Revert "Automatic changelog generation for PR #2590 [ci skip]"

This reverts commit 201e07033f.

* Revert "[MIRROR] Gives the detective a mass spectrometer (#2590)"

This reverts commit 5c98b9a13b.

* Revert "Quick sync (#2587)"

This reverts commit 92e055be97.

* Revert "Automatic changelog generation for PR #2557 [ci skip]"

This reverts commit 241a10d88d.

* Revert "Decreases hacked ai module cost (#2557)"

This reverts commit d959b7538a.

* Revert "[MIRROR] Port material containers to datum components (#2562)"

This reverts commit 32300086d5.
 2017-09-04 09:07:40 -05:00
CitadelStationBot
32300086d5 [MIRROR] Port material containers to datum components (#2562) 
* Port material containers to datum components

* Fixes Rej
 2017-09-04 04:08:42 -05:00
kevinz000
5c7b743cfa Merge pull request #2405 2017-08-29 22:27:10 -07:00
kevinz000
301a581e64 sync 2017-08-29 09:41:11 -07:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
CitadelStationBot
66f046fe87 Fixes timestop spell (#2506) 2017-08-26 19:49:16 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
LetterJay
f2f1474123 Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747 
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
 2017-08-21 20:32:10 -05:00
Poojawa
91fc414b20 Changes Ghost role ping sound effects (#2441) 
* change that fucking blare

* Update xenobiology.dm
 2017-08-21 17:05:09 -07:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
4d19a89519 Removes a great amount of machinery copypasta with circuitboards. 2017-08-09 19:24:19 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
5fd31559ea [MIRROR] Fixed typo for cyberimp_surgical's ID (#2229) 
* Fixed typo for cyberimp_surgical's ID

* Delete medical_designs.dm.rej

* Update medical_designs.dm
 2017-08-05 10:29:02 -07:00
CitadelStationBot
fd59456a73 [MIRROR] Adds Surgical toolarms to R&D, makes them less robust (#2197) 
* Adds Surgical toolarms to R&D, makes them less robust

* Delete medical_designs.dm

* Delete augments_arms.dm

* Delete tools.dm
 2017-08-05 10:27:12 -07:00
CitadelStationBot
1b22c5fe0c [MIRROR] Separates actions.dmi into multiple files (#2214) 
* Separates actions.dmi into multiple files

* Delete beam_rifle.dm.rej

* Delete action.dm.rej
 2017-08-03 06:09:39 -07:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00