Commit Graph

8425 Commits

Author SHA1 Message Date
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
Liam
e292b050f8 bye 2018-01-30 22:44:21 -06:00
vuonojenmustaturska
ec182ac486 Merge pull request #35125 from Cyberboss/BlameTheBee
[s] Fix bobby tables
2018-01-30 22:44:13 -06:00
Poojawa
67ac5abfaa properly aligned you fucking tit. 2018-01-30 15:29:02 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -06:00
CitadelStationBot
f3c585935f [MIRROR] Typo fix in Bubblegum desc and outdated comment (#5198)
* Merge pull request #35055 from 81Denton/hecking-typo

Typo fix in Bubblegum desc and outdated comment

* Typo fix in Bubblegum desc and outdated comment
2018-01-30 10:14:23 -06:00
CitadelStationBot
cb58800683 [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)
* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires
2018-01-30 07:32:34 -06:00
CitadelStationBot
02b3e47fc3 [MIRROR] Cosmic Bedsheet (#5170)
* adds cosmic space bedsheet

* Cosmic Bedsheet
2018-01-30 07:31:26 -06:00
CitadelStationBot
eb9bfbcbb0 [MIRROR] Expand Cyborg (#5183)
* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg
2018-01-30 07:30:51 -06:00
CitadelStationBot
c93df0ae55 [MIRROR] Makes fire colorful and anime (#5187)
* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime
2018-01-30 07:26:04 -06:00
CitadelStationBot
0b330482fc [MIRROR] New Coffin Sprite (#5190)
* coffins have a new sprite (#34995)

* New Coffin Sprite
2018-01-30 07:24:18 -06:00
CitadelStationBot
001dbde0c9 [MIRROR] Sexy Solar Sprites (#5191)
* replaced solar panel sprites with better ones

* Sexy Solar Sprites
2018-01-30 07:23:46 -06:00
CitadelStationBot
670bc6a929 [MIRROR] Better Chat Squashing (#5193)
* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing
2018-01-30 07:23:18 -06:00
Jordan Brown
bfd6f8b792 Fixes blood contract names (#35064) 2018-01-29 21:57:11 -06:00
PKPenguin321
e4dd53a89f adds extendohands (#34599)
* adds extendohands

* adds to arcade prizes, crafting menu
also adds an alternate named/desc'd version for arcade prizes

* removes the else

* actual conflict fix instead of accidental revert

* ACME -> acme
2018-01-29 21:56:44 -06:00
vuonojenmustaturska
5541395022 Merge pull request #35047 from ShizCalev/servant_blocker-bomb
Fixes being able to bomb servant blockers
2018-01-29 21:55:38 -06:00