shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,969 Commits 5 Branches 0 Tags
2e2e1cb1bfbfd7f7d3574f9be92e4e8af8665a91
Commit Graph

13969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58
2e2e1cb1bf Merge pull request #5484 from Poojawa/emag-usage 
Emag limits
 2018-02-18 23:26:44 +00:00
CitadelStationBot
39e3ffcd17 Automatic changelog generation for PR #5432 [ci skip] 2018-02-18 11:35:26 -06:00
LetterJay
5d2d54fc46 Merge pull request #5432 from jakeramsay007/QM-as-Head 
QM is now a Head of Staff, everyone rejoice!
 2018-02-18 11:35:24 -06:00
Chayse Ramsay
0b42003f53 Merge branch 'master' into QM-as-Head 2018-02-18 03:46:35 +00:00
CitadelStationBot
7fe1c87666 Automatic changelog generation for PR #5534 [ci skip] 2018-02-17 19:18:24 -06: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
deathride58
1447d4106f Merge pull request #5507 from Citadel-Station-13/upstream-merge-35478 
[MIRROR] Added chemical reaction unit tests
 2018-02-18 00:56:37 +00: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
d85116abe7 fixes travis 2018-02-17 18:10:21 -06:00
CitadelStationBot
ca5095a1b3 Automatic changelog generation for PR #5515 [ci skip] 2018-02-17 18:05:28 -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
Poojawa
7d488e8f4c Citadel'd Maps from #5523 (#5551) 
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
 2018-02-17 18:04:28 -06:00
CitadelStationBot
7864d4e475 Automatic changelog generation for PR #5555 [ci skip] 2018-02-17 17:46:48 -06:00
CitadelStationBot
b3266870a6 [MIRROR] Fixes some tool interactions (#5555) 
* Merge pull request #35724 from DaxDupont/bordlisten-loves-the-cocks

Fixes some tool interactions

* Fixes some tool interactions
 2018-02-17 17:46:46 -06:00
CitadelStationBot
3a202a73b5 Automatic changelog generation for PR #5554 [ci skip] 2018-02-17 17:46:38 -06:00
CitadelStationBot
7c036d7ca1 [MIRROR] Select Equipment works on observers (#5554) 
* Merge pull request #35728 from coiax/select-equipment-on-ghosts

Select Equipment works on observers

* Select Equipment works on observers
 2018-02-17 17:46:36 -06:00
CitadelStationBot
3effccd281 Automatic changelog generation for PR #5496 [ci skip] 2018-02-17 15:24:51 -06:00
deathride58
d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339 
[MIRROR] Support stations with multiple z-levels
 2018-02-17 21:24:48 +00:00
deathride58
6a7d414fdf fixes compiling errors hopefully 2018-02-17 15:57:34 -05:00
deathride58
f072def90e Merge pull request #5533 from Citadel-Station-13/upstream-merge-35673 
[MIRROR] All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals.
 2018-02-17 20:44:57 +00:00
Poojawa
4ea9eb1fa5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2018-02-17 14:44:36 -06:00
Poojawa
bd79a988bb backs up citadel edited maps 2018-02-17 14:44:31 -06:00
CitadelStationBot
bd6345ffd5 Automatic changelog generation for PR #5550 [ci skip] 2018-02-17 14:44:08 -06:00
deathride58
305849fba4 Merge pull request #5550 from Citadel-Station-13/upstream-merge-35726 
[MIRROR] Reflectors now reset the range of a projectile like before!
 2018-02-17 20:44:06 +00:00
deathride58
a0d6b9ad4f Update tgstation.dme 2018-02-17 14:36:06 -05:00
CitadelStationBot
39d9284715 Automatic changelog generation for PR #5549 [ci skip] 2018-02-17 13:31:49 -06:00
deathride58
fc041fbb34 Merge pull request #5549 from Citadel-Station-13/upstream-merge-35732 
[MIRROR] fixes poddoor examine message
 2018-02-17 19:31:47 +00:00
CitadelStationBot
07f88892ad Automatic changelog generation for PR #5539 [ci skip] 2018-02-17 13:31:36 -06:00
deathride58
e9f6fb08bd Merge pull request #5539 from Citadel-Station-13/upstream-merge-35731 
[MIRROR] Map spawned corpses start with their suit sensors turned off
 2018-02-17 19:31:34 +00:00
CitadelStationBot
d017dc0517 Automatic changelog generation for PR #5535 [ci skip] 2018-02-17 13:31:22 -06:00
deathride58
5374724165 Merge pull request #5535 from Citadel-Station-13/upstream-merge-35707 
[MIRROR] Adds rainbow slime clusterbangs
 2018-02-17 19:31:20 +00:00
deathride58
fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668 
[MIRROR] Quote the armor lists
 2018-02-17 19:29:50 +00:00
CitadelStationBot
0dcd644827 Reflectors now reset the range of a projectile like before! 2018-02-17 13:18:08 -06:00
Dax Dupont
f31df38f83 Reflectors now reset the range of a projectile like before! (#35726) 
* Reflectors now reset the range of a projectile.

* how about dem apples
 2018-02-17 13:18:08 -06:00
CitadelStationBot
7a5929bfb0 fixes poddoor examine message 2018-02-17 13:16:53 -06:00
yorii
f03905ebde fixes poddoor examine message (#35732) 
examining a blast door do longer gives the regular door examination about the maintenance panel.
 2018-02-17 13:16:53 -06:00
CitadelStationBot
f1d33ec520 Automatic changelog generation for PR #5525 [ci skip] 2018-02-17 11:51:47 -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
CitadelStationBot
9bfe0ec64e Automatic changelog generation for PR #5548 [ci skip] 2018-02-17 11:49:51 -06:00
LetterJay
c4d5dd34a3 Merge pull request #5548 from Citadel-Station-13/upstream-merge-35705 
[MIRROR] Fixes lava burning unconstructed HE-pipes
 2018-02-17 11:49:49 -06:00
CitadelStationBot
e535428bf3 Automatic changelog generation for PR #5547 [ci skip] 2018-02-17 11:49:17 -06:00
LetterJay
3c8fd612a0 Merge pull request #5547 from Citadel-Station-13/upstream-merge-35722 
[MIRROR] Fixes extremely thicc robots
 2018-02-17 11:49:15 -06:00
CitadelStationBot
4d882e1818 Automatic changelog generation for PR #5546 [ci skip] 2018-02-17 11:48:53 -06:00
LetterJay
6cb37cbc3d Merge pull request #5546 from Citadel-Station-13/upstream-merge-35725 
[MIRROR] Jellypeople (and all subtypes) now can actually speak Slime, as intended
 2018-02-17 11:48:51 -06:00
LetterJay
5745b4ada3 Merge pull request #5545 from Citadel-Station-13/upstream-merge-35736 
[MIRROR] Removes abstract shotgun from Summon Guns list
 2018-02-17 11:48:19 -06:00
LetterJay
559ec2fcf6 Merge pull request #5543 from Citadel-Station-13/upstream-merge-35604 
[MIRROR] Refactors mech construction datums
 2018-02-17 11:47:48 -06:00
CitadelStationBot
1deb5d10f7 Automatic changelog generation for PR #5542 [ci skip] 2018-02-17 11:47:38 -06:00
LetterJay
fb7e1b1438 Merge pull request #5542 from Citadel-Station-13/upstream-merge-35735 
[MIRROR] RESISTHOT species can put out fires with their hands
 2018-02-17 11:47:35 -06:00
LetterJay
92526a4a94 Update corpse.dm 2018-02-17 11:47:24 -06:00
LetterJay
d186b0ef0e Merge pull request #5544 from Citadel-Station-13/upstream-merge-35720 
[MIRROR] Pulling claw grammar fix
 2018-02-17 11:46:52 -06:00