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

8454 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Poojawa
ab0e0667f2 Makes Travis happy 2018-01-31 18:11:19 -06:00
Poojawa
2f16174e7c overdue refractor on layering code 
also probably fixes missing sprites
 2018-01-31 10:13:17 -06:00
Poojawa
aa04e62b29 cult lol xd 2018-01-31 08:07:22 -06:00
Poojawa
d7f8b8fbe4 dme enabling 2018-01-31 07:17:21 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
Poojawa
a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
LetterJay
18229f81b7 Merge pull request #5221 from Citadel-Station-13/upstream-merge-35170 
[MIRROR] Add whiteship dock to space ruin code
 2018-01-31 04:14:40 -06:00
LetterJay
37d0ad44cd Merge pull request #5218 from Citadel-Station-13/upstream-merge-35127 
[MIRROR] Redone Coffin Icons (Dikembe Mutombo Edition)
 2018-01-31 04:13:05 -06:00
LetterJay
527e6545e2 Merge pull request #5216 from Citadel-Station-13/upstream-merge-35081 
[MIRROR] Potato battery nerf
 2018-01-31 04:12:45 -06:00
LetterJay
903a89e281 Merge pull request #5213 from Citadel-Station-13/upstream-merge-35045 
[MIRROR] Turrets now check borgs!
 2018-01-31 04:12:11 -06:00
LetterJay
7ac807afa6 Merge pull request #5184 from Citadel-Station-13/upstream-merge-34849 
[MIRROR] Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC
 2018-01-31 04:07:37 -06:00
LetterJay
5ff485d4bf Merge pull request #5182 from improvedname/packs 
Adds kinkmate refill packages to cargo
 2018-01-31 04:06:57 -06:00
LetterJay
3dc5dc2974 Merge pull request #5181 from Citadel-Station-13/upstream-merge-35003 
[MIRROR] Makes the asset cache faster
 2018-01-31 04:06:43 -06:00
LetterJay
32256336b3 Merge pull request #5177 from deathride58/mycomputerisapotato 
Moves toggle animal digestion button to object tab
 2018-01-31 04:05:45 -06:00
LetterJay
fb5125bd16 Merge pull request #5171 from Citadel-Station-13/upstream-merge-35027 
[MIRROR] Adds cloning data disks to techwebs
 2018-01-31 03:03:15 -06:00
LetterJay
0b50addb85 Merge pull request #5169 from improvedname/Kinky 
Adds shockcollars to the kinkmate for a price of one coin
 2018-01-31 03:03:04 -06:00
LetterJay
9a24afb8a4 Merge pull request #5164 from Citadel-Station-13/upstream-merge-34950 
[MIRROR] Readds bz canisters to cargo order packs
 2018-01-31 03:02:31 -06:00
Tad Hardesty
62c9be914e Add whiteship dock to space ruin code (#35170) 2018-01-31 03:00:54 -06:00