shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,073 Commits 5 Branches 0 Tags
22b634fe61ba45e1f70dcf3731cd95047cf44e83
Commit Graph

73 Commits

Author SHA1 Message Date
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
deathride58
d40d9791c4 Merge pull request #8271 from Citadel-Station-13/kevinz000-patch-41 
the chaplain can now choose a weakened Eutactic energy sword as a holy weapon
 2019-05-21 08:06:21 -04:00
kevinz000
a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker 
[Ready]Makes a blue space bike horn HONK
 2019-05-20 23:40:17 -07:00
deathride58
50bdbcc46f Merge branch 'master' into kevinz000-patch-41 2019-05-17 00:29:31 -04:00
kevinz000
4190a00693 Update eutactic_blades.dm 2019-04-20 19:37:54 -07:00
kevinz000
b1d358ed79 Update eutactic_blades.dm 2019-04-20 19:26:53 -07:00
kevinz000
22f72c6431 Update eutactic_blades.dm 2019-04-20 19:23:10 -07:00
Poojawa
30dbc57e75 Labcoats carry mk II hypos, kits hold more 2019-04-11 06:55:57 -05:00
Trilbyspaceclone
dcfbcbae6d woops forgot the moodlit 2019-03-28 19:49:50 -04:00
Trilbyspaceclone
2ecc532c48 Update honk.dm 2019-03-28 19:40:28 -04:00
Ragolution
890a23df52 Github client is shit. 
Ooga
 2019-03-14 00:16:11 -04:00
Ragolution
8cc589b069 Actually fixes the thing. 
Turns out this was 100% easier to fix than I thought.
 2019-03-14 00:03:37 -04:00
Poojawa
d429eb67cd remodularize vtec code 
Works as expected now but, combat rework meme jog/spring override speeds
 2018-10-20 07:19:19 -05:00
Poojawa
1d6355534c Unmodularizes vtech controls 
I swear most of this shit just doesn't work in modularization anymore.
 2018-10-20 04:18:09 -05:00
deathride58
212187620b Merge pull request #7599 from Poojawa/override-override 
Digitigrade Uniforms from Oracle
 2018-09-29 21:30:12 -04:00
Poojawa
f2faf66586 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into modular_cit_cleaning 2018-09-28 22:09:19 -05:00
Poojawa
2daa197605 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into override-override 2018-09-27 05:09:23 -05:00
Poojawa
4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
izzyinbox
9a98b92c58 fixes tennis ball equip slots (#7582) 2018-09-26 12:16:13 -07:00
Poojawa
4efdf4b0b3 Cleans up Modular_citadel 
Yes I know it'll have merge conflicts later.
 2018-09-21 03:52:13 -05:00
Poojawa
dc9fd6db12 readds V-tech control, modularized properly 2018-09-17 22:35:43 -05:00
deathride58
4208d6ea5f Adds boombox donor item for Raiq/chefferz (#7368) 2018-08-03 19:29:19 -07:00
Letter N
5c79a794ec Update holy_weapons.dm 2018-07-06 17:20:30 +08:00
Letter N
bff55cc362 Update handcuffs.dm 2018-07-06 17:19:56 +08:00
deathride58
cec2871db2 Merge pull request #7293 from LetterN/patch-4 
fixes kinkmate
 2018-07-06 01:36:15 -04:00
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
Letter N
493a356338 Update machine_circuitboards.dm 2018-07-02 09:13:28 +00:00
deathride58
4d79c5ef09 Merge pull request #7110 from Michiyamenotehifunana/Random-Donator-Thing-1 
Adds the Not-Nanotrasen Corporate Uniform and a Silver Bike Horn
 2018-06-26 14:06:32 -04:00
Letter N
5813950aff fixes shock collars 2018-06-18 14:28:43 +08:00
Michiyamenotehifunana
e4e0e0d91d Adds random things for Jay to do things with 2018-06-15 13:50:15 +08:00
deathride58
6ac830a123 Combat rework adjustments (Making use of 512's new filter feature, small balance tweaks, and more) (#6092) 
* makes use of 512's filters, adds combat mode toggle component signals, and more

* Update phantomthief.dm

* Update living.dm
 2018-05-27 17:18:40 -07:00
LetterJay
42dd419f80 Update eutactic_blades.dm 2018-05-23 05:42:31 -05:00
LetterJay
e4c8e1b416 Update eutactic_blades.dm 2018-05-22 09:29:23 -05:00
LetterJay
1e207a7430 modular_citadel 2018-05-20 23:04:13 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Cebutris
3102b47775 Makes the desc more generic 2018-03-26 09:46:54 -04:00
Cebutris
2fd234256e adds lavaknight corpses to legion drops 2018-03-26 09:29:22 -04:00
LetterJay
41c6c4aa4b wrong location 2018-03-22 22:23:42 -05:00
LetterJay
09cd9189e3 fixes missing shock collar icon 2018-03-22 12:10:08 -05:00
Poojawa
b4a7def5ca Hypospray kits and reworks! (#5907) 
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
 2018-03-21 15:28:06 -05:00
deathride58
0a331a26ee Merge pull request #5994 from Poojawa/beepboop 
Adds IPCs refractors preferences
 2018-03-21 19:20:43 +00:00
Poojawa
f3a806923c Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop 2018-03-20 23:00:12 -05:00
Michiyamenotehifunana
61fde978e1 Tennis Balls! (and donator stuff) (#5962) 
* Donator rainbow stuff and balls!

* Updates code and adds izzy's donator thing

* Adds right click memes!
 2018-03-20 19:11:34 -05:00
LetterJay
e01a0d521d Update shockcollar.dm 2018-03-19 23:44:13 -05:00
LetterJay
18759e03b3 op 2018-03-18 15:47:48 -05:00
Poojawa
796e22beac LOCAL SUNE PORTS... OH GOD WHAT HAPPENED 
That feel when you're in the 'Oh, well while I'm here...' mindset.
 2018-03-18 09:02:13 -05:00
Michiyamenotehifunana
b479e5fc7a [Ready for Review] Revamps Wish Granters (#5773) 
* Rebalances Wishgranters

* Removes accidental copypasta

* Revamps Wish Granters entirely!

* Finishes Wishgranter revamp, rebalances eutactic blades

* Adds more bonuses to wishgranter wishes, fixes unintentional nerf to Dragons Tooth

* Updates teleporter code to actually work

* Now with 120% more paranoia!
 2018-03-16 03:34:06 -07:00
deathride58
8923bb9488 Small combat balancing: Small crawling nerf, Esword buff (#5937) 
* adds a delay and message to crawling underneath people

* makes eswords take less stamloss to swing around, lays down groundwork for later parts of combat reworks

* FUCK
 2018-03-16 03:27:30 -07:00
Poojawa
86b11050b6 Citadel's folder's end (#5828) 
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
 2018-03-06 17:40:48 -06:00