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

13063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
2abb2b2e9d [MIRROR] Revert "Removes unused consts from dbcore (#34711)" (#5206) 
* Merge pull request #35120 from tgstation/a

Revert "Removes unused consts from dbcore (#34711)"

* Revert "Removes unused consts from dbcore (#34711)"
 2018-02-04 22:12:37 -06:00
CitadelStationBot
1d11603d52 [MIRROR] Fixes a naughty dot (#5237) 
* Merge pull request #35150 from DaxDupont/myanusisbleeding

Fixes a naughty dot

* Fixes a naughty dot
 2018-02-04 22:11:48 -06:00
CitadelStationBot
695284fcd8 Automatic changelog generation for PR #5234 [ci skip] 2018-02-04 22:11:34 -06:00
CitadelStationBot
50fa4d2239 [MIRROR] Blacklists servant golems from the magic mirror (#5234) 
* Blacklists servant golems from the magic mirror (#35147)

* Blacklists servant golems from the magic mirror
 2018-02-04 22:11:32 -06:00
CitadelStationBot
e2ce020a62 [MIRROR] Fixes a couple of typos and ports one New to Initialize (#5233) 
* Merge pull request #35145 from vuonojenmustaturska/acidtypos

Fixes a couple of typos and ports one New to Initialize

* Fixes a couple of typos and ports one New to Initialize
 2018-02-04 22:11:07 -06:00
CitadelStationBot
7fcb3eddba Automatic changelog generation for PR #5179 [ci skip] 2018-02-04 22:10:23 -06:00
cebutris
44908503bf Stunswords! (#5179) 
* adds in stunswords

* inhands!

* fixes cell charge text.

* adds in the kit and also fuck admin.txt

* Fixes some formatting

* replaces the placeholder icon with

* i hate everything

* tries to fix the dme. hopefully.

* tries again
 2018-02-04 22:10:21 -06:00
CitadelStationBot
91345fddc1 Automatic changelog generation for PR #5231 [ci skip] 2018-02-04 22:09:40 -06:00
CitadelStationBot
ba06d1cb97 [MIRROR] Listening fix (#5231) 
* Removes ghost spawner from Syndicate listening ruin (#35083)

* Does what Kor says

* Other part of the fix if Kor wants it

* Does what KorPhearon wants

* Listening fix
 2018-02-04 22:09:38 -06:00
CitadelStationBot
31b261ff7b [MIRROR] Increases mineral amount needed for rough metal false walls (#5229) 
* Increases mineral amount needed for rough metal false walls (#35065)

* Increases mineral amount needed for rough metal false walls
 2018-02-04 22:08:28 -06:00
CitadelStationBot
4d1a5db892 [MIRROR] Corrects Some \ref Macros (#5228) 
* Merge pull request #35136 from uraniummeltdown/correcttheref

Corrects Some \ref Macros

* Corrects Some \ref Macros
 2018-02-04 22:08:05 -06:00
CitadelStationBot
b3f36e5917 Automatic changelog generation for PR #5227 [ci skip] 2018-02-04 22:07:44 -06:00
CitadelStationBot
684c98d2e2 [MIRROR] Cloner checks if occupant is human rather than just carbon (#5227) 
* Cloner checks if occupant is human rather than just carbon (#35077)

* Makes cloner sure its human

* Revert "Makes cloner sure its human"

This reverts commit 2591f2a7cd74cc83d9afcbac5df59bfea20962df.

* travis fix maybe

* Cloner checks if occupant is human rather than just carbon
 2018-02-04 22:07:42 -06:00
CitadelStationBot
3578d42011 Automatic changelog generation for PR #5226 [ci skip] 2018-02-04 22:07:19 -06:00
CitadelStationBot
ee0245c79f [MIRROR] Tomatoes and other foods found to have girl parts; removed from vegetable piles (#5226) 
* Merge pull request #35122 from CosmicScientist/you-say-tomaetoe-i-say-tomato-youre-wrong

Tomatoes and other foods found to have girl parts; removed from vegetable piles

* Tomatoes and other foods found to have girl parts; removed from vegetable piles
 2018-02-04 22:07:17 -06:00
CitadelStationBot
dc06d0373c [MIRROR] Fixes lightfixture placement issue (#5225) 
* Fixes lightfixture placement issue

* Fixes lightfixture placement issue
 2018-02-04 22:06:22 -06:00
CitadelStationBot
450fda474a [MIRROR] Corrects space tiles on Abandoned Teleporter (#5224) 
* Corrects space tiles on Abandoned Teleporter

* Corrects space tiles on Abandoned Teleporter
 2018-02-04 22:06:04 -06:00
CitadelStationBot
1af771372e Automatic changelog generation for PR #4374 [ci skip] 2018-02-04 21:29:50 -06:00
deathride58
30ab115665 Makes Cit widescreen by default (#4374) 
* updates title screen to be WIDESCREEN

* increase default size of view window

* widescreen fullscreen overlays

* and finally, the switch can be hit

* Update skin.dmf

* readds splitter=75, the main screen breaks without it
 2018-02-04 21:29:48 -06:00
CitadelStationBot
dbad755d40 Automatic changelog generation for PR #4281 [ci skip] 2018-02-04 21:28:44 -06:00
deathride58
142e96a2dd [READY] Adds night shifts (#4281) 
* initial commit - adds night shifts

* fixes lighting not updating when nightshift is triggered and fixes compiling issues

* makes red alert override nightshift

* Update lighting.dm

* adds announcements for nightshift changes

* fixes nightshift flip-flopping during the night, adjusts night message a little, moves from minor_announce to priority_announce

* Update cit_nightshift.dm

* fixes compiling errors
 2018-02-04 21:28:41 -06:00
Poojawa
f8b030f18f Can't trust people not to cause problems. 2018-02-04 19:11:10 -06:00
CitadelStationBot
a6070e7719 Automatic changelog generation for PR #5236 [ci skip] 2018-02-04 10:17:34 -06:00
LetterJay
18e5a976b3 Merge pull request #5236 from Citadel-Station-13/TG-sync-testing 
TG Sync 1/31
 2018-02-04 10:17:31 -06:00
Poojawa
467df149fd I swear every player on this server is a complete idiot 
God forbid anyone has anything remotely fun.
 2018-02-04 08:16:54 -06:00
Poojawa
8c48f46dd0 tump buckets and force the failsafe to trigger 2018-02-04 04:58:43 -06:00
Poojawa
4581364afd mso suggested remedy 2018-02-03 21:57:58 -06:00
Poojawa
bba401a437 might help to ensure it's enabled 2018-02-03 10:53:39 -06:00
Poojawa
40c98ad9ff adds sickshot to the same lockers as defibs 2018-02-03 10:40:42 -06:00
Poojawa
ed72d175c8 actually no, let's just do this 2018-02-03 10:34:42 -06:00
Poojawa
1bc69ec9b2 Vore alterations 2018-02-03 10:28:27 -06:00
Poojawa
7294424397 Makes Stargazers admin only 2018-02-03 09:03:16 -06:00
Poojawa
4f8153ce69 FINALLY FIXES BORG ITEM BLACKLIST AAAAAAAAAAAA 2018-02-03 09:03:03 -06:00
Poojawa
9755eb28ee compile fixes 2018-02-03 06:32:16 -06:00
Poojawa
d0a05393b4 Merge branch 'TG-sync-testing' of https://github.com/Citadel-Station-13/Citadel-Station-13 into TG-sync-testing 2018-02-03 06:24:31 -06:00
Poojawa
059b34050b Removes Stargazers, far too liable to be abused by powergamers 2018-02-03 06:24:27 -06:00
deathride58
ab1c75edbb Temporarily disables autocall 2018-02-02 23:17:31 -05:00
deathride58
09436512b4 Merge branch 'master' into TG-sync-testing 2018-02-03 01:52:44 +00:00
Poojawa
9b976b1c04 fixes missing hands sprites 2018-02-02 17:45:13 -06:00
CitadelStationBot
f02529555c [MIRROR] Fix roundend splash screens (#5242) 
* Fix roundend splash screens

* Update screen_objects.dm
 2018-02-02 01:22:56 -06:00
Poojawa
5680a33004 If you're having trouble, move the priority check higher 2018-02-01 22:31:42 -06:00
Poojawa
e0703fcecc Removes Fun 2018-02-01 21:39:30 -06:00
Poojawa
dae0a7a808 Merge branch 'TG-sync-testing' of https://github.com/Citadel-Station-13/Citadel-Station-13 into TG-sync-testing 2018-02-01 12:59:06 -06:00
CitadelStationBot
5b2bdf7670 Automatic changelog generation for PR #5251 [ci skip] 2018-02-01 12:58:46 -06:00
deathride58
408e0cce5f Fixes genital previews (#5251) 2018-02-01 12:58:44 -06:00
Poojawa
ea5fff30bf refractors genital overlays to mutable_appearance 2018-02-01 12:54:45 -06:00
Poojawa
ae888f1dff fix problems with one weird trick 
if I'm not using something, I shouldn't be using it.
 2018-02-01 08:56:01 -06:00
Zna12
5e06583dad What a mess. (#5238) 
This should fix the issue of having the minerals and output coming out of the wrong sides of the ORM.
 2018-02-01 06:20:43 -08:00
Poojawa
faccc43461 fucking github REEEEEEEEEEE 2018-01-31 18:33:46 -06:00
Poojawa
ebf5366e73 Delta was apparantly a github copy/paste wtf 2018-01-31 18:23:42 -06:00