Commit Graph

482 Commits

Author SHA1 Message Date
deathride58
05ab5f7c0c Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552
[MIRROR] [s]Fixes writing bugs/exploits
2018-02-16 01:32:23 +00:00
ShizCalev
98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
Jordan Brown
e95d3cd700 Merge pull request #35661 from MrStonedOne/patch-483
Mekhi goes on the table
2018-02-15 10:38:37 -06:00
CitadelStationBot
9b4770f855 [MIRROR] Mining tools now use tool system (#5462)
* Mining tools now use tool system

* Update hydroponics.dm
2018-02-14 05:36:15 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
Robustin
1825c944b6 Cult Update? Cult Update! (#35433)
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
2018-02-12 15:18:21 -06:00
LetterJay
e4c49c3ce4 Merge pull request #5433 from Citadel-Station-13/upstream-merge-35566
[MIRROR] Urinal cakes can now be picked up again
2018-02-12 10:03:05 -06:00
LetterJay
15572d1d5f Merge pull request #5430 from Citadel-Station-13/upstream-merge-35514
[MIRROR] Fixes wrong ID for syndicate ghost roles
2018-02-12 10:01:42 -06:00
MoreRobustThanYou
0af6af731a Urinal cakes can now be picked up again (#35566)
* Urinal cakes can now be picked up again

* Update watercloset.dm

* Update watercloset.dm

* Update watercloset.dm
2018-02-12 09:01:28 -06:00
Jordan Brown
e2b4e3c567 Fixes wrong ID for syndicate ghost roles 2018-02-11 15:35:14 -06:00
MoreRobustThanYou
6337c294d9 Makes urinal cakes more realistic (#35515)
* Add files via upload

* Makes urinal cakes blue

* Add files via upload

* Delete urinalcake_squish.png
2018-02-11 15:29:47 -06:00
CitadelStationBot
51d15518ae Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456
[MIRROR] [s] Fixes altclick exploits
2018-02-11 09:43:09 -06:00
uraniummeltdown
e3ec8a648a Buildable Shuttle/Plastitanium Windows (#35376)
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
2018-02-11 05:13:37 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
CitadelStationBot
717da969a6 [MIRROR] Var cleanup and map fixes (#5359)
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
deathride58
830b33da59 Merge pull request #5347 from Citadel-Station-13/upstream-merge-35360
[MIRROR] Removes synths and androids from magic mirror
2018-02-07 19:08:27 +00:00
vuonojenmustaturska
ca5f5f6f1f Merge pull request #35360 from Robustin/blackmirror
Removes synths and androids from magic mirror
2018-02-07 04:42:01 -06:00
vuonojenmustaturska
192e548bb3 Merge pull request #35363 from Xhuis/chair_nerf
Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
2018-02-07 04:39:21 -06:00
CitadelStationBot
b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333)
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
2018-02-06 18:24:51 -06:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBot
92212cdcb6 [MIRROR] Moves the spare ID inside the captain's locker (#5291)
* Moves the spare ID inside the captain's locker (#35219)

* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)

* Moves the spare ID inside the captain's locker
2018-02-05 05:36:09 -06:00
CitadelStationBot
2ab7a45cb9 If the person inside a morgue tray is clonable, they now beep. Loudly. (#5302) 2018-02-05 05:35:44 -06:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
CitadelStationBot
d4c270fe4a [MIRROR] [READY] Fixes de-initialization of cleanables-ash (#5295)
* [READY] Fixes de-initialization of cleanables-ash

* Update morgue.dm

* Update morgue.dm
2018-02-05 03:20:09 -06:00
CitadelStationBot
64c43ee5bc Morgue Trays now provide correct light-indication (#5262) 2018-02-05 01:26:36 -06:00
CitadelStationBot
17ccbb4a53 [MIRROR] Adds tiny shards (#5299)
* Adds tiny shards (#35070)

* Adds tiny shards

* .

* .

* .

* .

* .

* .

* Adds tiny shards
2018-02-05 00:53:52 -06:00
cebutris
53ce73528a Buffs tablepushing (#5222)
* Buffs tablepushing

* review
2018-02-04 23:26:43 -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
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
Poojawa
f8b030f18f Can't trust people not to cause problems. 2018-02-04 19:11:10 -06:00
Poojawa
40c98ad9ff adds sickshot to the same lockers as defibs 2018-02-03 10:40:42 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -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
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Jordan Brown
b9f575fa11 Merge pull request #34926 from ShizCalev/morguetray-revenant
Makes revenants spawn on dead bodies & bodycontainers
2018-01-28 18:03:41 -06:00
deathride58
8ee42a5282 Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755
[MIRROR] All color inputs use current color as default choice
2018-01-26 15:44:23 +00:00
LetterJay
dd31c777a5 Merge pull request #5068 from Citadel-Station-13/upstream-merge-34807
[MIRROR] Fixes the kitchen spike turning people upside down forever
2018-01-24 20:46:16 -06:00
Jordan Brown
51e4d9f9db All color inputs use current color as default choice 2018-01-24 18:14:16 -06:00
KorPhaeron
7267f4a5f3 Fixes the kitchen spike turning people upside down forever (#34807) 2018-01-24 13:02:39 -06:00
kevinz000
f903330b0e Xeno nests are no longer held together by bolts. (#34766)
* Update bed.dm

* Update alien_nest.dm
2018-01-24 06:12:37 -06:00
LetterJay
f26f1b5370 Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522
[MIRROR] Adds ~70 more suicides
2018-01-23 10:00:04 -06:00
LetterJay
4c2c14784b Merge pull request #5035 from Citadel-Station-13/upstream-merge-34560
[MIRROR] Adds the Bluespace Drop Pod upgrade to the cargo express console
2018-01-23 09:59:41 -06:00
AnturK
eb7974df7d Simple rotation component. (#34476)
I'm going to port other rotations to it when i don't feel lazy.
Closes #34064
2018-01-23 02:09:16 -06:00
MrDoomBringer
4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
MrDoomBringer
8e090b430b Adds the Bluespace Drop Pod upgrade to the cargo express console 2018-01-23 01:36:43 -06:00
Jordan Brown
bb51095b00 Merge pull request #34656 from ShizCalev/makeslippery
Fixes missing MakeSlippery() args
2018-01-20 14:09:49 -06:00
deathride58
1a9e1b36a1 Merge pull request #4962 from Citadel-Station-13/upstream-merge-34514
[MIRROR] You can now buckle people to target stakes
2018-01-19 19:44:39 +00:00
kevinz000
b7df40727d You can now buckle people to target stakes (#34514)
* Update target_stake.dm

* Update target_stake.dm

* Update target_stake.dm
2018-01-19 09:52:42 -06:00
Jordan Brown
5e58abca3a Merge pull request #34551 from MrDoomBringer/DropItLikeItsHottest
fixes supply drop pods being impossible to dissassemble
2018-01-19 09:43:21 -06:00
Leo
0d6d7116ff Merge pull request #34533 from Buggy123/patch-56
Fixes integrity value for non-reinforced plasma window
2018-01-18 06:11:01 -06:00