shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,796 Commits 5 Branches 0 Tags
18a99fae2e72183bc855b8d586fe2bdaa37ccba7
Commit Graph

14796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Zna12
cc6bab0c06 Foam Lasertag Darts (#5847) 
* Laser Tag Darts.

Darts that are compatable with the laser tag system

* Lastag Ammo Boxes. Autoylathe Update.

* Final bug fixes.
 2018-03-13 18:39:19 -05:00
CitadelStationBot
f4aaa942e1 Automatic changelog generation for PR #5874 [ci skip] 2018-03-13 18:38:52 -05:00
deathride58
7b9dac0a47 Makes the titlescreen properly positioned for widescreen again (#5874) 
* Makes the titlescreen properly positioned for widescreen again

* Appeases Pooj, requests knot
 2018-03-13 18:38:49 -05:00
CitadelStationBot
dff9dabf06 [MIRROR] Fixes stopsounds properly (#5931) 
* Fixes stopsounds properly (#36341)

* Revert "Merge pull request #36340 from vuonojenmustaturska/beelogreen"

This reverts commit 259838f38cfda32619e34cf41d57df4d45b75363, reversing
changes made to 111cd316a92f5f5840d96b1fc4bbe4cb7b1ce6fd.

* Fixes stopsounds properly

Also I forgot to actually block admins from bad protocols
it just showed them a message that it was blocked but didn't
block it

* Fixes stopsounds properly
 2018-03-13 05:46:27 -05:00
CitadelStationBot
8dc9fcf816 [MIRROR] Fixes blindfolds blinding when not over your eyes (#5936) 
* Fixes blindfolds blinding when not over your eyes (#36316)

* fixes blindfolds

* lets use ref instead then

* Fixes blindfolds blinding when not over your eyes
 2018-03-13 05:45:53 -05:00
CitadelStationBot
a58a8cdefb [MIRROR] Fixes client version config not working (#5935) 
* Merge pull request #36350 from MrStonedOne/patch-490

Fixes client version config not working

* Fixes client version config not working
 2018-03-13 05:45:34 -05:00
CitadelStationBot
90673bc54b Automatic changelog generation for PR #5920 [ci skip] 2018-03-12 13:13:02 -05:00
CitadelStationBot
31ffc89cbc [MIRROR] Adds the Aurora Caelus event, the deep-space equivalent of the northern lights. (#5920) 
* Adds the Aurora Caelus event, the deep-space equivalent of the northern lights. (#35987)

* Aurora caelus

* I saw that!

* fix?

* Weight increase for testmerge

* Update aurora_caelus.dm

* Adds the Aurora Caelus event, the deep-space equivalent of the northern lights.
 2018-03-12 13:13:00 -05:00
CitadelStationBot
d6478f19c9 Automatic changelog generation for PR #5925 [ci skip] 2018-03-12 13:12:20 -05:00
CitadelStationBot
b24f4a7f1f [MIRROR] Allows medical sprays to be stored in medical belts and smartfridges (#5925) 
* Medical sprays can now be added to medical belts and smartfridges (#36313)

* Allows medical sprays to be stored in medical belts and smartfridges
 2018-03-12 13:12:18 -05:00
CitadelStationBot
2c10a07538 Automatic changelog generation for PR #5912 [ci skip] 2018-03-12 07:58:51 -05:00
CitadelStationBot
fd42d55993 [MIRROR] Fixes stopsounds (#5912) 
* Fixes stopsounds

* Update playsound.dm
 2018-03-12 07:58:48 -05:00
CitadelStationBot
3e5f79332a Automatic changelog generation for PR #5917 [ci skip] 2018-03-12 07:39:40 -05:00
CitadelStationBot
544d7bcaf4 [MIRROR] Adds descriptions to all cargo orders! (#5917) 
* Adds descriptions to all cargo orders!

* recompiles tgui
 2018-03-12 07:39:38 -05:00
CitadelStationBot
68eb27820e Automatic changelog generation for PR #5922 [ci skip] 2018-03-12 07:30:31 -05:00
CitadelStationBot
71b3349c2d [MIRROR] Custom dockers must be greater than 10 tiles from map edge (#5922) 
* Custom dockers must be greater than 10 tiles from map edge (#36306)

* Custom dockers must be greater than 10 tiles from map edge
 2018-03-12 07:30:29 -05:00
CitadelStationBot
c3edb62df9 [MIRROR] Hopefully fixes unnecessary nightshift announcements (#5923) 
* Hopefully fixes unnecessary nightshift announcements (#36173)

* Hopefully fixes unnecessary nightshift announcements
 2018-03-12 07:30:16 -05:00
CitadelStationBot
dcc9e9d8d7 Automatic changelog generation for PR #5924 [ci skip] 2018-03-12 07:30:07 -05:00
CitadelStationBot
c91006c27f [MIRROR] Create ERT refactor (#5924) 
* Create ERT refactor (#36321)

cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl

* Create ERT refactor
 2018-03-12 07:30:03 -05:00
CitadelStationBot
6a65ed49d0 Automatic changelog generation for PR #5921 [ci skip] 2018-03-12 07:08:37 -05:00
CitadelStationBot
f9c1114ec1 [MIRROR] Pacifists can no longer cause harm using mech equipment (#5921) 
* Pacifists can no longer cause harm using mech equipment (#36293)

* Fixes pacifists from firing mech weapons that cause harm

* Pacifists can still use mining equipment on non-living objects

* I'm a big ol dumbo that forgot how booleans are handled

* missed one

* forgot to save file before commit. Now all booleans are fixed

* CAPS

* Pacifists can't drill, clamp, or melee hit a closed locker or crate. prevents them from killing people inside them

* Pacifists now know if a container has a living being in it and will not drill, clamp, or melee it if it does.

* made change as requested by duncathan

* added an exception to the hydraulic clamp so that it can pick up containers with people in them.

* Pacifists can no longer cause harm using mech equipment
 2018-03-12 07:08:34 -05:00