shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,362 Commits 5 Branches 0 Tags
36b3e13c8cbaf24e1bdcefc3fc0b2facebf5c040
Commit Graph

102 Commits

Author SHA1 Message Date
LetterJay
36b3e13c8c Merge pull request #5697 from Michiyamenotehifunana/Great-Trigonometric-Sprite-Replacement 
The Great Trigonometric Sprite Replacement, Phase 1!
 2018-02-28 23:53:29 -06:00
Chayse Ramsay
75b978a08b Slimepeople are considered holy creatures and now get healed 2018-02-27 15:12:30 +00:00
Chayse Ramsay
ee66a24288 Prayer bead buffs 2018-02-27 15:01:02 +00:00
Michiyamenotehifunana
70be9f3027 Reverts particle blasters, modifies sprites 2018-02-26 22:41:47 +08:00
Michiyamenotehifunana
b858e54d03 The Great Trigonometric Sprite Replacement, Phase 1! 2018-02-25 20:10:39 +08:00
kevinz000
5971347949 Nerfhammer 2.0 2018-02-24 14:01:02 -08:00
kevinz000
b631a8dee1 nerfs griefing shits 2018-02-24 09:01:29 -08:00
LetterJay
6ce5985f9f Merge pull request #5638 from Citadel-Station-13/upstream-merge-35775 
[MIRROR] [READY]Randomized Station Time + Night Shifts
 2018-02-24 00:24:47 -06:00
Poojawa
32f66fc5a3 Adds Shock collars back to autolathes 2018-02-23 06:52:41 -06:00
deathride58
5bf04475b8 Delete cit_nightshift.dm 2018-02-21 13:09:54 -05:00
Chayse Ramsay
863dad8906 Changes the HoP to require Service experience (#5618) 2018-02-21 09:32:10 -06:00
LetterJay
8483f94d5f Blood Red Tie - Donator Loadout (#5579) 
* donation item

* path cleanup

* ditto

* Update __donator.dm
 2018-02-18 19:37:10 -06:00
cebutris
fb43a6d0e9 Gives mineral storage access to those who need it (#5478) 
* Gives material storage access to those who need it

* Update engineering.dm

* reee tabbing

* Update tgstation.dme
 2018-02-18 19:26:39 -06:00
deathride58
0e9125eeaf makes lighting a little fancier (#5576) 2018-02-18 19:26:15 -06:00
deathride58
af759e9849 reduces base rnd point generation rate to 1,200 points per minute (#5558) 2018-02-18 19:20:44 -06:00
Poojawa
8b529bcd6b Buffs door security. (#5574) 
* Buffs door security.

* a n n o y i n g

* oh right, obj not wires
 2018-02-18 19:20:26 -06:00
deathride58
2e2e1cb1bf Merge pull request #5484 from Poojawa/emag-usage 
Emag limits
 2018-02-18 23:26:44 +00:00
Chayse Ramsay
0b42003f53 Merge branch 'master' into QM-as-Head 2018-02-18 03:46:35 +00:00
Zna12
1585de0687 [Ready to merge] Au-toy-lathe (#5534) 
* Autoylathe Complete.

All the errors with the autoylathe should be fixed for now

* Toylathe Tweaking and plastic's initializing.

Well, this gets plastics halfway there. The toylathe now has 8 categories to choose from and some other sutff. It's all coming back.

* TOY LATHE NOW ACCEPTING PLASTIC

TOYLATHE IS WORKING AND RUNNING PROPERLY. SOME GUNS HAVE BEEN ADDED AND WILL NEED MORE TIME TO ADD MORE GUNS.

* Toy Datum construction.

Building some datums for the toys for the autoylathe to print.

* Toys toys toys

Adding toys to the list woo

* Autoylathe complete.

Holy shit it's fucking done.

* Fixes a duplicate id.

Also adds some shit to the hacked list.

* Okay this shit needs to stop

Rogue indentations? Nani?

* ugh

fuck

* Rogue indents

* Power issues

Fixes power scaling and the draining an APC

* Rogue File deletion.

Part of an early experiment that didn't work out.

* Some other tweaks and shit

Moves datums to the autoylathe designs and also fixes a dumb mistake I made.

* Clamps?

Added a clamp. Who knew?

* Shit.

Won't compile if it keeps looking for a file that doesn't exist

* Woops

Deleted a line not paying attention

* reworked initialize

I think I did this right.

* Revert "reworked initialize"

This reverts commit 649c156baebd64b6cd84e95f2f4c3cbd70dabce7.

* Odd variables that don't have any other references in the coding.

Why are these even here? Seriously.

* UNUSED VARIABLE?!

NANI?! Deleted. Don't need em.
 2018-02-17 17:18:22 -08:00
LetterJay
641af8166b Merge pull request #5452 from cebutris/crazycatgirls 
Adds in special fluff items for TechnicalMagi
 2018-02-17 18:45:27 -06:00
Poojawa
c0850044a7 Flightsuit Armor adjustments (#5515) 
* armor tweaks

* marks the nerfs for future generations to respect.

* Modularizes values

flags are still getting trimmed tho.

* reee
 2018-02-17 18:05:26 -06:00
LetterJay
e809725afd Merge pull request #5525 from jakeramsay007/slimepeoplerework 
[Ready!] The Slimening - Reworking slimepeople to be less like humans without unbalanced advantages.
 2018-02-17 11:51:45 -06:00
Chayse Ramsay
8b3ae0fdd5 Merge branch 'master' into QM-as-Head 2018-02-16 16:09:18 +00:00
Chayse Ramsay
47e9b2fe63 More Requested Changes 2018-02-16 15:52:28 +00:00
LetterJay
dd5c717152 Merge pull request #5490 from cebutris/ssword 
Adds stunsword modification kits to the security vendor
 2018-02-16 07:58:14 -06:00
Chayse Ramsay
377c116662 Merge branch 'master' into QM-as-Head 2018-02-16 13:09:58 +00:00
Cebutris
17729fbefd Adds in stunsword kits to secvend 2018-02-15 08:15:05 -05:00
Chayse Ramsay
cfe11488b6 Re-adds HoP to the Civilian joblist 
Should make them able to be chosen as a job again
 2018-02-15 10:15:34 +00:00
Poojawa
01bc7310b6 Cryopods from Oracle Station 
It's really nice to have a tg based station that's porting good shit.
 2018-02-14 14:06:33 -06:00
cebutris
56e81d3a4f Merge branch 'master' into crazycatgirls 2018-02-14 12:33:45 -05:00
Poojawa
9c71763225 fixes duplicate issues 2018-02-14 10:44:29 -06:00
Poojawa
1b8471f7a4 Emag limits 2018-02-14 10:32:12 -06:00
deathride58
040c43a531 Merge pull request #5440 from cebutris/analbeads 
Ports prayer beads from Paradise
 2018-02-14 01:56:21 +00:00
LetterJay
c52562fed3 Update __donator.dm 2018-02-13 12:10:24 -06:00
Cebutris
d54a92ef46 adds the crazy catslut stuff to the loadout 2018-02-12 22:04:44 -05:00
cebutris
a47a660b35 Whoops I missed something 2018-02-12 13:29:51 -05:00
Cebutris
079127dd59 Adds in prayer beads! 2018-02-12 11:17:38 -05:00
Chayse Ramsay
4d7e9caa52 Goofed on the HoP's arrival announcement channel 2018-02-12 03:03:35 +00:00
Chayse Ramsay
84b637b405 Requested changes done 2018-02-12 02:35:17 +00:00
Chayse Ramsay
a1116f6dc8 QM is now a Head of Staff, everyone rejoice 2018-02-12 01:52:33 +00:00
Nick
8ef7eea4fa Merge branch 'master' into bunnypack 2018-02-09 07:10:12 +01:00
Improvedname
d2404d3cf7 has 2018-02-09 07:09:10 +01:00
Improvedname
464077ef3a bunni 2018-02-08 20:31:26 +01:00
deathride58
2e255f3b8b fixes nightlights not dimming properly at the start of the round 2018-02-07 22:27:29 -05:00
deathride58
d236b75ca0 adds widescreen pref 2018-02-07 01:42:31 -05:00
Michiyamenotehifunana
389e6de8f5 FINALLY modularizes Polychromic Clothes AND modernizes all polychromic code! (#5269) 
* FINALLY AFTER 2 MONTHS

WOOOOOOOOOOOOOOO

* Updates all polychromic code

This makes the default argument of all polychromic color input menus the last chosen color.
 2018-02-06 19:08:08 -06:00
theTiji0
2d06c71404 added space kiwis as a new simple mob (#5334) 
* added space kiwis as a new simple mob

* Fixed syntax typo

I hate everything
 2018-02-06 19:07:31 -06:00
deathride58
0ecb7ad81b Merge branch 'master' into cargonia-is-glorious! 2018-02-06 02:54:58 +00:00
deathride58
d5f703bc58 Merge pull request #5317 from improvedname/Loadout 
Organizes job spefific loadout stuff by departments
 2018-02-06 02:53:57 +00:00
deathride58
a3649fc6fe Merge pull request #5316 from improvedname/Cargo 
Turns the kinkmate resupply crate into an construction kit
 2018-02-06 02:53:24 +00:00