shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,817 Commits 5 Branches 0 Tags
304ac2f89cf8ea09cb03cb106e4bc50db2ff2156
Commit Graph

14817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58
304ac2f89c Merge pull request #5972 from Citadel-Station-13/upstream-merge-36446 
[MIRROR] Fix stray pixels in Death Ripley sprite
 2018-03-17 23:49:53 +00:00
deathride58
f5e49123e0 Merge pull request #5971 from Citadel-Station-13/upstream-merge-36409 
[MIRROR] Fixed cameras holding up the arrival shuttle
 2018-03-17 23:49:23 +00:00
deathride58
1fc5fe361c Merge pull request #5970 from Citadel-Station-13/upstream-merge-36393 
[MIRROR] Fixes bluespace radio potions
 2018-03-17 23:49:02 +00:00
deathride58
c00c135ed4 Merge pull request #5969 from Citadel-Station-13/upstream-merge-36371 
[MIRROR] Fixes false wall layering
 2018-03-17 23:47:47 +00:00
deathride58
fc59e7d42f Merge pull request #5968 from Citadel-Station-13/upstream-merge-36079 
[MIRROR] [S] Fixes tables being bluespace magnets
 2018-03-17 23:47:29 +00:00
deathride58
b0f4508392 Merge pull request #5967 from Citadel-Station-13/upstream-merge-36130 
[MIRROR] [READY] Refactors wet floors to a component
 2018-03-17 23:47:15 +00:00
deathride58
f817344a7f Merge pull request #5966 from Citadel-Station-13/upstream-merge-36154 
[MIRROR] Allows traitor AI's to take direct control of turrets.
 2018-03-17 23:46:28 +00:00
deathride58
18a99fae2e Merge pull request #5965 from Citadel-Station-13/upstream-merge-36460 
[MIRROR] Fix mislabelled and stacked OmegaStation cameras
 2018-03-17 23:46:08 +00:00
CitadelStationBot
94d92b18e2 Fix stray pixels in Death Ripley sprite 2018-03-17 07:53:54 -05:00
oranges
352cb2632d Merge pull request #36446 from AutomaticFrenzy/patch/death-ripley 
Fix stray pixels in Death Ripley sprite
 2018-03-17 07:53:53 -05:00
CitadelStationBot
fde2867e08 Fixed cameras holding up the arrival shuttle 2018-03-17 07:53:45 -05:00
oranges
11d1119d6f Merge pull request #36409 from Cruix/disease_shuttle 
Fixed cameras holding up the arrival shuttle
 2018-03-17 07:53:44 -05:00
CitadelStationBot
8744168363 Fixes bluespace radio potions 2018-03-17 07:53:37 -05:00
oranges
e4c2aae759 Merge pull request #36393 from Polyphynx/slimeradio 
Fixes bluespace radio potions
 2018-03-17 07:53:37 -05:00
CitadelStationBot
89131ddc03 Fixes false wall layering 2018-03-17 07:53:28 -05:00
oranges
9f561a6a65 Merge pull request #36371 from ShizCalev/false-wall-layer-fix 
Fixes false wall layering
 2018-03-17 07:53:28 -05:00
CitadelStationBot
a66e03658c [S] Fixes tables being bluespace magnets 2018-03-17 07:53:20 -05:00
oranges
dd55ad6f88 Merge pull request #36079 from deathride58/nerfstheskylarlinemanexperience 
[S] Fixes tables being bluespace magnets
 2018-03-17 07:53:20 -05:00
CitadelStationBot
e6ebda9fd2 [READY] Refactors wet floors to a component 2018-03-17 07:53:11 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130) 
* Wet Floor components

* No more turf wet slide.
 2018-03-17 07:53:11 -05:00
CitadelStationBot
53e5939d8d Allows traitor AI's to take direct control of turrets. 2018-03-17 07:53:01 -05:00
AnturK
80e046572f Allows traitor AI's to take direct control of turrets. (#36154) 
* Allows traitor AI's to take direct control of turrets.

* Adds some icons
 2018-03-17 07:53:01 -05:00
CitadelStationBot
c102a97e7c Fix mislabelled and stacked OmegaStation cameras 2018-03-17 07:52:52 -05:00
Tad Hardesty
5edfbf5224 Fix mislabelled and stacked OmegaStation cameras (#36460) 
* Fix stacked camera in OmegaStation departures

* Move some Omega cameras to the correct network
 2018-03-17 07:52:52 -05:00
CitadelStationBot
13709a7d34 [MIRROR] Simple xeno antagonist (#5961) 
* Simple xeno antagonist

* Merge pull request #36397 from AnturK/xeno_antag

Simple xeno antagonist
 2018-03-17 05:23:21 -05:00
deathride58
063abf2a5d Makes xenobio consoles upgradeable via disks obtainable from bluespace research, makes most xenobio console abilities exclusive to disk upgrades (#5953) 
* Makes xenobiology consoles rely on upgrades, spreads out xenobio console abilities into upgrade disks

* Update xenobio_camera.dm
 2018-03-16 10:13:06 -07: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
Zna12
c2e95fc233 Oh that blob (#5934) 
Removed minimum player count for the blobs.
 2018-03-16 03:21:34 -07:00
Useroth
e4778dc751 Makes shock collars actually obtainable from KinkMates. (#5938) 2018-03-16 03:20:08 -07:00
deathride58
135163734b Merge pull request #5957 from Poojawa/pubbyfix 
Pubbyfix
 2018-03-16 03:15:49 +00:00
CitadelStationBot
0bf1f7ce14 [MIRROR] Refactors some trauma code, fixes some trauma heals not working (#5955) 
* Refactors some trauma code, fixes some trauma heals not working (#36093)

* Refactors some trauma code, fixes some trauma heals not working

* that too

* fix indent

* antur comments

* Refactors some trauma code, fixes some trauma heals not working
 2018-03-15 20:50:10 -05:00
Poojawa
31d988344a maybe actually have mentors that aren't broke as shit (#5954) 2018-03-15 20:49:32 -05:00
Poojawa
74eddfd888 Fixes broken engineering in Pubby 2018-03-15 20:45:50 -05:00
Poojawa
be49ca2209 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into pubbyfix 2018-03-15 20:35:49 -05:00
CitadelStationBot
89f37cc8b7 [MIRROR] Fixes broken bot icons (#5952) 
* Merge pull request #36379 from ShizCalev/bot-icon-fixes

Fixes broken bot icons

* Fixes broken bot icons
 2018-03-15 07:20:24 -05:00
Poojawa
ae2541f0fb Fixes missing href on borg sleepers (#5930) 
* Fixes missing href

* Update dogborg_sleeper.dm
 2018-03-15 04:44:03 -05:00
Poojawa
452b58d1a1 makes traits more paranoid, also removes the double application (#5929) 2018-03-14 17:28:42 -05:00
deathride58
035b3458de MDB fix attempt number two. (#5928) 
* HOPEFULLY fixes mapdiffbot

* attempt number 2
 2018-03-14 17:08:19 -05:00
CitadelStationBot
17e8b5748e Automatic changelog generation for PR #5950 [ci skip] 2018-03-14 16:58:38 -05:00
CitadelStationBot
f00246ae79 [MIRROR] The names of Surgery Disks now match their type of surgery (#5950) 
* The names of Surgery Disks now match their type of surgery

* Merge pull request #36407 from SailorDave/surgery-disk-names

The names of Surgery Disks now match their type of surgery
 2018-03-14 16:58:36 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
CitadelStationBot
be23070f67 Automatic changelog generation for PR #5941 [ci skip] 2018-03-14 10:42:17 -05:00
LetterJay
3e95574d1e Merge pull request #5941 from Citadel-Station-13/upstream-merge-36346 
[MIRROR] Makes touching (8)balls take less time
 2018-03-14 10:42:13 -05:00
LetterJay
cc814bf5cc Merge pull request #5940 from Citadel-Station-13/upstream-merge-36355 
[MIRROR] Fixes chemical implant manual activation oversight
 2018-03-14 10:41:46 -05:00
CitadelStationBot
c3da95567f Makes touching (8)balls take less time 2018-03-13 23:04:39 -05:00
Dax Dupont
f132f6d703 Makes touching (8)balls take less time (#36346) 
* Makes touching (8)balls take less time

* Lower it more because holy shit
 2018-03-13 23:04:39 -05:00
CitadelStationBot
c24d13d05d Fixes chemical implant manual activation oversight 2018-03-13 23:04:16 -05:00
kevinz000
0e4f0c0211 Exploit 2018-03-13 23:04:15 -05:00
CitadelStationBot
ea4061c014 Automatic changelog generation for PR #5847 [ci skip] 2018-03-13 18:39:21 -05:00