Commit Graph

923 Commits

Author SHA1 Message Date
MMMiracles
2d499b938c adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168)
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
2018-02-07 20:23:32 -06:00
deathride58
b8f9807e39 Merge pull request #5358 from Citadel-Station-13/upstream-merge-35395
[MIRROR] Fixes callbacks and invoke time args failing when pushUsr was used
2018-02-07 19:12:35 +00:00
deathride58
8e439ec317 Merge pull request #5354 from Citadel-Station-13/upstream-merge-35369
[MIRROR] Adds the saltmine shuttle.
2018-02-07 19:11:31 +00:00
Kyle Spier-Swenson
07e10c38e1 Fixes callbacks and invoke time args failing when pushUsr was used (#35395)
* Fixes callbacks and invoke time args failing when pushUsr was used

* y u do dis byond
2018-02-07 12:38:36 -06:00
Dax Dupont
0f8b7da2a1 Adds the saltmine shuttle. (#35369)
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
2018-02-07 07:17:50 -06:00
Dax Dupont
ed18c63441 Holopictures and more! (#35303)
* Holopictures and more!

* Remiedation
2018-02-07 05:17:41 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -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
b0fb541b8c [MIRROR] Adds some customization to ruin loader (#5289)
* Adds some customization to ruin loader

* Update maps.dm
2018-02-05 02:33:20 -06:00
CitadelStationBot
7149ae03b7 [MIRROR] Fixes blood overlay layers. (#5277)
* Fixes blood overlay layers.

* Update blood.dm
2018-02-05 02:09:29 -06:00
CitadelStationBot
fb03783346 [MIRROR] Fixes changelings retaining fake brains on de-changelining (#5248)
* Merge pull request #34872 from AnturK/theresabraininymyhead

Fixes changelings retaining fake brains on de-changelining

* Fixes changelings retaining fake brains on de-changelining
2018-02-05 00:56:51 -06:00
CitadelStationBot
c014527627 [MIRROR] Hijack objectives will only be given out if there are 30 or more players. (#5258)
* Hijack objectives will only be given out if there are 30 or more players. (#35202)

* Hijack objectives will only be given out if there are 30 or more players.
2018-02-04 22:37:00 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -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
deathride58
b0712e4892 Merge pull request #5116 from Citadel-Station-13/upstream-merge-34915
[MIRROR] Fixed the simple rotation component
2018-01-26 15:55:10 +00:00
deathride58
0dcb98f754 Merge pull request #5115 from Citadel-Station-13/upstream-merge-34918
[MIRROR] Correct spelling of armament
2018-01-26 15:54:46 +00:00
Jordan Brown
f703e0f8d8 Merge pull request #34915 from Cruix/flipstuff
Fixed the simple rotation component
2018-01-26 03:01:11 -06:00
Jordan Brown
721f628f60 Merge pull request #34918 from AutomaticFrenzy/patch/armament
Correct spelling of armament
2018-01-26 03:01:01 -06:00
ShizCalev
44e3afe30a clear_zeroth_law sanity check 2018-01-26 02:59:29 -06:00
LetterJay
1f5e9983bc Merge pull request #5099 from Citadel-Station-13/upstream-merge-34858
[MIRROR] Adds hotspots to chasm blacklist
2018-01-25 14:15:18 -06:00
LetterJay
13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466
[MIRROR] Fake nuclear disks are even more convincing
2018-01-25 13:41:02 -06:00
Jordan Brown
01f89292a2 Adds hotspots to chasm blacklist (#34858)
* Adds hotspots to chasm blacklist

* Blacklists landmarks from chasms
2018-01-25 05:10:59 -06:00
LetterJay
a090f2823d Merge pull request #5093 from Citadel-Station-13/upstream-merge-34827
[MIRROR] Spawns a pen-uplink if you don't have one /w pen pref.
2018-01-24 21:45:29 -06:00
LetterJay
8f62c0823a Merge pull request #5075 from Citadel-Station-13/upstream-merge-34800
[MIRROR] martial art sanity check
2018-01-24 20:45:33 -06:00
ExcessiveUseOfCobblestone
596aea6bbb Spawns a pen-uplink if you don't have one /w pen pref. (#34827)
* Update mind.dm

* ok togopal i guess you could call that a webedit

* AHHHHHH

* xhuis

* I only had 1 cup of coffee today ok

* dost thou hast storage?

* cb

* we did it... we finally did it.
2018-01-24 18:45:21 -06:00
Leo
c3ba7008d1 Merge pull request #34800 from ShizCalev/everybody-was-kungfoo-fighting
martial art sanity check
2018-01-24 14:07:24 -06:00
Ashe Higgs
be9f8a2d06 Refactors and nerfs Fleshmend 2018-01-24 13:56:20 -06:00
Leo
e71ce4e8cf Merge pull request #34775 from ShizCalev/removed-named-args-from-visible_message
Removed named args from visible_message
2018-01-24 11:59:50 -06:00
LetterJay
30ae21043f Merge pull request #5045 from Citadel-Station-13/upstream-merge-34476
[MIRROR] Simple rotation component.
2018-01-23 08:24:19 -06:00
LetterJay
b603bb9fbb Merge pull request #5041 from Citadel-Station-13/upstream-merge-34767
[MIRROR] Fix replace_random_law runtime
2018-01-23 08:23:10 -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
oranges
58855df5dd Merge pull request #34767 from AutomaticFrenzy/patch/replace-random-law
Fix replace_random_law runtime
2018-01-23 01:43:00 -06:00
coiax
f425c5496f Fake nuclear disks are even more convincing 2018-01-23 01:41:21 -06:00
AnturK
1a85c90fab Adds transform helpers to atom vv (#34756) 2018-01-22 15:42:53 -06:00
Emmett Gaines
e149fe390e Changeling clothes blood fix (#34743) 2018-01-22 13:08:07 -06:00
LetterJay
b87972b15c Merge pull request #5014 from Citadel-Station-13/upstream-merge-34314
[MIRROR] Datum var cleanup
2018-01-21 23:14:18 -06:00
Jordan Brown
e84617f17b Datum var cleanup (#34314)
* Consolidates datum var location

* Move ui_screen to /datum/tgui

* Move focusers to datum.dm. Move fingerprintslast to /atom

* Remove focusers list, makes mobs check if their focus is QDELETED in Life()

* Consolidate use_tag and var_edited into datum_flags

* Revert garbage comment

* Thought I already removed this

* Remove the var_edited preservation

* Removes focus QDELETED handling
2018-01-21 21:39:46 -06:00
MoreRobustThanYou
c889a965df Fixes each monkey having it's own individual monkey_team (#34709)
* Fixes monkey teams

* Update monkey.dm
2018-01-21 21:15:09 -06:00
deathride58
28751ba370 Merge pull request #5001 from Citadel-Station-13/upstream-merge-34633
[MIRROR] Refactor weather to use Z traits, assorted related cleanup
2018-01-21 22:42:53 +00:00
deathride58
625d46fa19 Merge pull request #4998 from Citadel-Station-13/upstream-merge-34606
[MIRROR] Config dir again except this time it works
2018-01-21 22:41:13 +00:00
deathride58
83135ca4e0 Merge pull request #4997 from Citadel-Station-13/upstream-merge-34567
[MIRROR] Fixes Revs & Clockcultists being valid for mindswap
2018-01-21 22:39:53 +00:00
Tad Hardesty
4451aca2e8 Refactor weather to use Z traits, assorted related cleanup (#34633)
* Add a proc for getting the station center

* Add a couple of comments to ZTRAIT defines

* Remove unused global_map list

* Refactor weather to use the trait system

* Un-hardcode the transit z-level

* Use Z traits to determine Portal Storm event areas

* Fix loading away missions containing anything that reads traits
2018-01-21 13:34:04 -06:00
Jordan Brown
8dead1da6a Config dir again except this time it works 2018-01-21 12:32:29 -06:00
ShizCalev
68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
Jordan Brown
a7c9593aa6 Merge pull request #34695 from AnturK/brotherobjectivefix
Fixes brother objectives not showing in TP
2018-01-21 09:16:05 -06:00
deathride58
b6fd362b95 Merge pull request #4942 from Citadel-Station-13/upstream-merge-34608
[MIRROR] Fixes some dumb code in the jousting component
2018-01-19 19:37:20 +00:00
deathride58
ea45eb72ef Merge pull request #4937 from Citadel-Station-13/upstream-merge-34634
[MIRROR] fix/spellcheck: Changes command error on cqc.dm
2018-01-19 19:36:02 +00:00
Jordan Brown
1b40c727b9 Merge pull request #34608 from ninjanomnom/kevin-is-terrible
Fixes some dumb code in the jousting component
2018-01-19 09:04:15 -06:00
ThePainkiller
90947a50ad fix/spellcheck: Changes command error on cqc.dm (#34634)
* Update holy_weapons.dm

* Update cqc.dm
2018-01-19 08:57:18 -06:00