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

8440 Commits

Author SHA1 Message Date
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
LetterJay
b450d5bce1 Merge pull request #5212 from Citadel-Station-13/upstream-merge-34951 
[MIRROR] Heartless humans now display as unsuitable for abductor experiments
 2018-01-31 03:00:38 -06:00
LetterJay
198677b4cf Merge pull request #5211 from Citadel-Station-13/upstream-merge-35116 
[MIRROR] Cleans up wirer code.
 2018-01-31 03:00:24 -06:00
LetterJay
48e5a3be80 Merge pull request #5209 from Citadel-Station-13/upstream-merge-35149 
[MIRROR] [s] Reverts smoke and foam buffs, disable foam combining
 2018-01-31 03:00:07 -06:00
LetterJay
e6574a34f6 Merge pull request #5208 from Citadel-Station-13/upstream-merge-35069 
[MIRROR] Removes Tech-Disk Exports
 2018-01-31 02:59:37 -06:00
LetterJay
3e7fa2cbdb Merge pull request #5207 from Citadel-Station-13/upstream-merge-35125 
[MIRROR] [s] Fix bobby tables
 2018-01-31 02:25:16 -06:00
Jittai
7dde4815ca Redone Coffin Icons (Dikembe Mutombo Edition) (#35127) 
* Coffins

* cleanup

* moar grain
 2018-01-31 01:52:40 -06:00
LetterJay
d49a578463 Merge pull request #5195 from Citadel-Station-13/upstream-merge-35064 
[MIRROR] Fixes blood contract names
 2018-01-30 23:16:41 -06:00
LetterJay
58da631638 Merge pull request #5192 from Citadel-Station-13/upstream-merge-34599 
[MIRROR] adds extendohands
 2018-01-30 23:16:22 -06:00
LetterJay
ce8114b291 Merge pull request #5185 from Citadel-Station-13/upstream-merge-35047 
[MIRROR] Fixes being able to bomb servant blockers
 2018-01-30 23:15:52 -06:00
Jalleo
358a6085a1 Potato battery nerf (#35081) 
* Very temp I want to see what people believe is a more suitable size because this is ridiculous

* Damn comments being my bane when I have to redo a local branch and mess up grr

* Does the request from the maintainer
 2018-01-30 22:45:38 -06:00
ExcessiveUseOfCobblestone
31cf679ce9 Turrets now check borgs! (#35045) 
* epic

* epic2

* epic

* 150 hours

* 150^2 hours
 2018-01-30 22:45:10 -06:00
vuonojenmustaturska
a334c51b20 Heartless humans now display as unsuitable for abductor experiments (#34951) 2018-01-30 22:44:58 -06:00
Iamgoofball
8e6aaf70c3 Cleans up wirer code. (#35116) 
* Cleans up wirer code.

🆑 Iamgoofball
fix: Minor code cleanup on the wirer
/🆑
 2018-01-30 22:44:49 -06:00
vuonojenmustaturska
eafccb8330 Reverts smoke and foam buffs, disable foam combining 2018-01-30 22:44:30 -06:00