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

14362 Commits

This Branch
This Branch
All Branches
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
CitadelStationBot
0f077de273 Automatic changelog generation for PR #5733 [ci skip] 2018-02-28 19:42:05 -06:00
CitadelStationBot
bbc261952e [MIRROR] Medals now show the commendation text in the description. (#5733) 
* Medals now show the commendation text in the description. (#36020)

* Medals now show the commendation text in the description

* the user is now real

* Medals now show the commendation text in the description.
 2018-02-28 19:42:03 -06:00
CitadelStationBot
78708a3582 [MIRROR] Fix icon of black fancy table in editor (#5735) 
* Fix icon of black fancy table in editor

* Fix icon of black fancy table in editor
 2018-02-28 19:41:44 -06:00
CitadelStationBot
b40980b0c1 [MIRROR] Fixes hidden node unlocking (#5731) 
* Merge pull request #36013 from kevinz000/techwebs_hotfix_1

Fixes hidden node unlocking

* Fixes hidden node unlocking
 2018-02-28 19:31:38 -06:00
CitadelStationBot
0a384c0df9 Automatic changelog generation for PR #5734 [ci skip] 2018-02-28 19:30:43 -06:00
CitadelStationBot
9b598e388c [MIRROR] Fixes Cyborg Defib units (#5734) 
* Fixes Cyborg Defib units (#36012)

* Fixes Cyborg Defib units

* Update defib.dm

* Fixes Cyborg Defibs

make it check for a false, not a true

* Fixes Cyborg Defib units
 2018-02-28 19:30:41 -06:00
CitadelStationBot
56137e19d7 [MIRROR] Fixes missing wire on boxstation (#5737) 
* Merge pull request #36011

Fixes missing wire on boxstation

* Fixes missing wire on boxstation
 2018-02-28 19:30:28 -06:00
CitadelStationBot
7d74ea4b98 Automatic changelog generation for PR #5727 [ci skip] 2018-02-28 09:51:02 -06:00
deathride58
9c450bdca7 Merge pull request #5727 from jakeramsay007/BuffsandNerfs 
Adjusting Prayer Beads to be more useful
 2018-02-28 15:50:59 +00:00
CitadelStationBot
8bb41bc345 Automatic changelog generation for PR #5730 [ci skip] 2018-02-28 09:50:13 -06:00
deathride58
641187a4b1 Merge pull request #5730 from Citadel-Station-13/upstream-merge-35911 
[MIRROR] Bath Salts now induce psychotic rage, but cause much more brain damage
 2018-02-28 15:50:05 +00:00
CitadelStationBot
7e0e97008b Automatic changelog generation for PR #5729 [ci skip] 2018-02-28 09:49:51 -06:00
deathride58
515da94d85 Merge pull request #5729 from Citadel-Station-13/upstream-merge-36016 
[MIRROR] Removes SNPCs
 2018-02-28 15:49:48 +00:00
Michiyamenotehifunana
49e662971f Updates Medical Wrench 2018-02-28 18:30:07 +08:00
CitadelStationBot
2291318876 Bath Salts now induce psychotic rage, but cause much more brain damage 2018-02-28 03:21:55 -06:00
XDTM
8c1e1aa3ef Bath Salts now induce psychotic rage, but cause much more brain damage (#35911) 
* Bath Salts now induce psychotic rage, but cause much more brain damage

* goodcode
 2018-02-28 03:21:55 -06:00
CitadelStationBot
e344fe7d05 Removes SNPCs 2018-02-28 00:12:13 -06:00
vuonojenmustaturska
afb1ab021b Removes SNPCs (#36016) 
* he's dead, jim

* a few stragglers

* Restores the populate world-verb
 2018-02-28 00:12:12 -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
1ee479266e Revision 15 of Syndivolver 2018-02-27 22:30:42 +08:00
CitadelStationBot
3a6d5f9512 Automatic changelog generation for PR #5726 [ci skip] 2018-02-27 07:41:40 -06:00
CitadelStationBot
a53e395606 [MIRROR] Tesla Corona Analyzers (#5726) 
* Tesla Corona Analyzers (#35965)

* Tesla Corona Analyzers

Generate points to make up for no bomb production on maps like Pubby

* Silly me, not Aurora, but Corona

* Adds sprites to the new mode

* new sprites! credit to... me!

* Further sprite tweaks.

* Tesla Corona Analyzers
 2018-02-27 07:41:38 -06:00
CitadelStationBot
ef864d109b Automatic changelog generation for PR #5719 [ci skip] 2018-02-27 05:28:20 -06:00
CitadelStationBot
4f983ae337 [MIRROR] Crab Rockets (#5719) 
* Crab Rockets

* fixes mirror bot's shit

* ...github wtf
 2018-02-27 05:28:17 -06:00
CitadelStationBot
be0a0440f1 Automatic changelog generation for PR #5701 [ci skip] 2018-02-27 05:05:04 -06:00
CitadelStationBot
2c5b8a586b [MIRROR] Operating computers now display required surgery chems (#5701) 
* Operating computers now display required surgery chems

* Rebuilds tgui
 2018-02-27 05:05:02 -06:00
CitadelStationBot
5f6c41fa30 [MIRROR] Ports more operations to "tool_act" (#5718) 
* Merge pull request #35854 from ACCount12/more_tool_act

Ports more operations to "tool_act"

* Ports more operations to "tool_act"
 2018-02-27 05:04:27 -06:00
CitadelStationBot
f74ceb582c Automatic changelog generation for PR #5717 [ci skip] 2018-02-27 05:04:15 -06:00
CitadelStationBot
4fed776e7e [MIRROR] Heart Attack Event Actually Works Now (#5717) 
* Merge pull request #35928 from Robustin/brokenhearts

Heart Attack Event Actually Works Now

* Heart Attack Event Actually Works Now
 2018-02-27 05:04:12 -06:00
CitadelStationBot
0ad6fe35e0 [MIRROR] [s] Fixes observers being able to create areas (#5724) 
* [s] Fixes observers being able to create areas (#36006)

* Fixes observers being able to create areas

* Exception for admin ghosts

* [s] Fixes observers being able to create areas
 2018-02-27 05:04:00 -06:00
CitadelStationBot
23c5092088 Automatic changelog generation for PR #5720 [ci skip] 2018-02-27 05:03:45 -06:00
CitadelStationBot
ff918707ee [MIRROR] Cleanbot fix (#5720) 
* Cleanbot fix (#36003)

cl selea
fix: fixed floorbot
fix: fixed cleanbot
refactor: improved pathiding in case of given minimal distance;improved sanitation
/cl
closes #35995, #35919

* Cleanbot fix
 2018-02-27 05:03:42 -06:00
CitadelStationBot
f38a3b3a39 Automatic changelog generation for PR #5723 [ci skip] 2018-02-27 05:03:09 -06:00
CitadelStationBot
f7ade14cf7 [MIRROR] A Nar-Sie Plushie can be used an an extra invoker now! (#5723) 
* A Nar-Sie Plushie can be used an an extra invoker now! (#35932)

* A Nar-Sie Plushie can be used an an extra invoker now!

you can't use 9 nar-sie plushies to invoke a rune, nar-sie plushies are only counted once

* Update runes.dm

* Update plushes.dm

* Update plushes.dm

* Update runes.dm

* A Nar-Sie Plushie can be used an an extra invoker now!
 2018-02-27 05:03:07 -06:00
CitadelStationBot
b7d616250d [MIRROR] Fixes hitscans, and this time, properly (#5716) 
* Merge pull request #35923 from kevinz000/i_betrayed_naksu

Fixes hitscans, and this time, properly

* Fixes hitscans, and this time, properly
 2018-02-26 15:59:26 -08:00
Michiyamenotehifunana
70be9f3027 Reverts particle blasters, modifies sprites 2018-02-26 22:41:47 +08:00
CitadelStationBot
749f8c4e5c [MIRROR] Revert "Mekhi goes on the table" (#5715) 
* Merge pull request #35980 from kevinz000/revert-35661-patch-483

Revert "Mekhi goes on the table"

* Revert "Mekhi goes on the table"
 2018-02-26 02:38:53 -08:00
Poojawa
f7f3a600bd Removes Golem access to the station (#5692) 2018-02-26 00:20:37 -06:00
CitadelStationBot
8d69f7d24a Automatic changelog generation for PR #5713 [ci skip] 2018-02-25 18:28:31 -06:00
deathride58
509148f7f3 Merge pull request #5713 from Citadel-Station-13/upstream-merge-35930 
[MIRROR] Blood Cult Conversion Fixes
 2018-02-26 00:28:29 +00:00
deathride58
2c84c6a040 Merge pull request #5712 from Citadel-Station-13/upstream-merge-35956 
[MIRROR] Cleans up double stacked firedoor on Pubby
 2018-02-26 00:27:53 +00:00
CitadelStationBot
0ccde8d176 Automatic changelog generation for PR #5714 [ci skip] 2018-02-25 18:27:41 -06:00
deathride58
8226f1d0f1 Merge pull request #5714 from Citadel-Station-13/upstream-merge-35665 
[MIRROR] Adds Tinfoil Hats
 2018-02-26 00:27:38 +00:00
CitadelStationBot
9a3753ef0f Adds Tinfoil Hats 2018-02-25 18:11:48 -06:00
MMMiracles
5493339c7d Adds Tinfoil Hats (#35665) 
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
 2018-02-25 18:11:48 -06:00
CitadelStationBot
51e2001a6e Blood Cult Conversion Fixes 2018-02-25 17:30:57 -06:00
Robustin
6c8ee4f99e Blood Cult Conversion Fixes (#35930) 
* Cult Fixes

* woops
 2018-02-25 17:30:57 -06:00
CitadelStationBot
bebbc1611d Automatic changelog generation for PR #5711 [ci skip] 2018-02-25 16:59:58 -06:00