Commit Graph

140 Commits

Author SHA1 Message Date
LetterJay
96a461e384 Merge pull request #6451 from Citadel-Station-13/upstream-merge-37218
[MIRROR] Couple of fixes for situations involving mechas and the clock cult gamemode
2018-04-22 02:34:53 -05:00
vuonojenmustaturska
32fe9d4fd6 Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
2018-04-18 09:33:31 -05:00
Jordan Brown
889f8ddb06 Merge pull request #37229 from vuonojenmustaturska/centcommission
Add team objective support to the centcom antag datum
2018-04-16 16:17:42 -05:00
shrimpboom8
677f3e8a7b Fixes imps all having the same name (#37168)
* Update imp.dm

* Replaced 1 with TRUE
2018-04-14 08:10:07 -05:00
LetterJay
8dec1d8926 Merge pull request #6363 from Citadel-Station-13/upstream-merge-37110
[MIRROR] fixes changelings stinging other lings twice
2018-04-14 07:44:22 -05:00
LetterJay
508e4f4d37 Update tiny_prick.dm 2018-04-12 07:03:26 -05:00
deathride58
538cb55b68 Merge pull request #6346 from Citadel-Station-13/upstream-merge-36791
[MIRROR] Cult spell buttons will no longer hold an empty slot in the regular action bar
2018-04-11 21:35:45 +00:00
imsxz
cfd3f7a4fd fixes changelings stinging other lings twice 2018-04-11 07:33:21 -05:00
vuonojenmustaturska
e9d2097610 Fixes warp whistle invis bug (#37077)
* Update artefact.dm

* review
2018-04-11 07:28:30 -05:00
Robustin
a79a168d2c Cult spell buttons will no longer hold an empty slot in the regular action bar (#36791) 2018-04-11 05:08:47 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
AnturK
a3f873e4b2 Makes revheads always show on top of the check antags listing. (#37033) 2018-04-08 19:23:24 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
vuonojenmustaturska
4b505112fc fixes revenant deadchat 2018-04-04 09:07:06 -05:00
deathride58
edccb8b3e4 Merge pull request #6153 from Citadel-Station-13/upstream-merge-36442
[MIRROR] Refactors Spell and Martial Art Books to use Action Granters!
2018-04-03 08:16:11 +00:00
kevinz000
91f9596eec damnit (#36886) 2018-04-02 02:13:03 -05:00
LetterJay
dd579e35bc Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548
[MIRROR] Added a new ability to sentient diseases
2018-04-01 19:50:43 -05:00
LetterJay
f7be23e78a Merge branch 'master' into upstream-merge-36442 2018-04-01 19:50:37 -05:00
LetterJay
b6873e9bd4 Merge pull request #6219 from Citadel-Station-13/upstream-merge-36857
[MIRROR] you can now walk through abductor table frames
2018-04-01 17:47:07 -05:00
LetterJay
6d117d18a3 Update spellbook.dm 2018-04-01 17:44:04 -05:00
YPOQ
a18aec6fa5 Fixes revenants being unable to siphon after failing a siphon 2018-04-01 08:33:39 -05:00
vuonojenmustaturska
7e639116f6 Merge pull request #36857 from iskyp/ayytableframes
you can now walk through abductor table frames
2018-04-01 07:33:14 -05:00
LetterJay
9dfa66afea Update spellbook.dm 2018-04-01 04:40:12 -05:00
LetterJay
24d4b310cd Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147
[MIRROR] [READY] ~SPELL CARDS~, homing projectiles, and more!
2018-04-01 01:01:55 -05:00
LetterJay
19df345067 Merge pull request #6191 from Citadel-Station-13/upstream-merge-36787
[MIRROR] Removed health cost for Twisted Construction upon casting on a wrong object
2018-03-31 18:42:51 -05:00
LetterJay
fa64b72ea6 Merge pull request #6180 from Citadel-Station-13/upstream-merge-36781
[MIRROR] Get_Flat_Human_Icon no longer draws asses that nobody wants
2018-03-31 18:39:15 -05:00
LetterJay
c3ddcb9da7 Merge pull request #6162 from Citadel-Station-13/upstream-merge-36628
[MIRROR] Fixes "ocular wardens don't target buckled mobs"
2018-03-31 06:20:12 -05:00
Jordan Brown
c48b35a0b2 Merge pull request #36787 from Davidj361/36744-twistedHealthFix
Removed health cost for Twisted Construction upon casting on a wrong object
2018-03-31 06:16:50 -05:00
Cruix
0b7f816033 Added a new ability to sentient diseases 2018-03-31 06:14:54 -05:00
Robustin
b26868a6b7 Get_Flat_Human_Icon no longer draws asses that nobody wants (#36781)
* Argument to limit excess icon work

* 50% less icon for your icon

* 75% less icon for your icon

* Correction

* statics the list, tweaks a default arg

* Cardinal argument list

* correct GLOB name
2018-03-31 06:13:28 -05:00
LetterJay
2e552042c5 Merge pull request #6136 from Citadel-Station-13/upstream-merge-36752
[MIRROR] Adds an admin follow link to revenant spawns
2018-03-31 06:13:22 -05:00
Davidj361
60091c50b5 Fixes "ocular wardens don't target buckled mobs" (#36628)
* Ocular wardens now shoot handcuffed and buckled, but not if they're spelled handcuffed.

* Clock cultists can spell cuff sec cuffed carbon mobs, so the ocular doesn't shoot them.

* Added in review suggestions

* More oversight
2018-03-28 13:42:59 -05:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
vuonojenmustaturska
c98ce25dfb adds an admin follow link to revenant spawns 2018-03-28 12:15:15 -05:00
Ashe Higgs
8ec16df2e4 Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426)
* Adds some more traits

* April Fools' heirlooms

* Fixes the detective sound

* Refactor to use signals
2018-03-28 12:15:06 -05:00
deathride58
66fc54fcd9 Update spellbook.dm 2018-03-27 13:43:48 -04:00
CitadelStationBot
5dabd9cb05 [MIRROR] Prevents sparks from passing through clockcult rifts (#6111)
* Prevents sparks from passing through clockcult rifts

* Prevents sparks from passing through clockcult rifts (#36692)

* Prevents sparks from passing through clockcult rifts

* Update city_of_cogs_rift.dm
2018-03-26 04:31:59 -05:00
CitadelStationBot
3fef96e3d1 [MIRROR] Fixes ninja objectives remaining when ninja antag removed (#6105)
* Merge pull request #36672 from YPOQ/objectivefix

Fixes ninja objectives remaining when ninja antag removed

* Fixes ninja objectives remaining when ninja antag removed
2018-03-26 04:30:03 -05:00
CitadelStationBot
4f254f181f [MIRROR] Sintouched antag datums (#6096)
* Sintouched antag datums (#36561)

* Sintouched stuff

* hudz

* These are boring and when they happen they happen en masse so let's just list them

* undefs

* Sintouched antag datums
2018-03-26 04:19:49 -05:00
CitadelStationBot
8321484d4d [MIRROR] Fixes swarmers getting killed by shocks (#6075)
* Fixes swarmer electrocution (#36596)

* Fixes swarmers getting killed by shocks
2018-03-22 19:30:37 -05:00
kevinz000
9eb6eb6225 [READY] ~SPELL CARDS~, homing projectiles, and more! 2018-03-22 15:40:07 -05:00
CitadelStationBot
b340810615 [MIRROR] Changes archives examine message (#6066)
* Changes archives examine message (#36585)

* Changes archives examine message

* Sure

* Changes archives examine message
2018-03-22 06:10:43 -05:00
CitadelStationBot
ad912651c7 [MIRROR] Blood rites fix (#6061)
* Blood rites fix (#36579)

* Blood rites fix
2018-03-22 06:08:05 -05:00
CitadelStationBot
dad2d44ea2 [MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)
* [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)

cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.

* [READY] Several fixes/changes to mood, longterm mood effects, beauty component
2018-03-19 21:33:18 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
CitadelStationBot
777a4473d8 [MIRROR] Fixes roundend report runtmining if no traitor had a uplink. (#6009)
* Fixes roundend report runtmining if no traitor had a uplink.

* Merge pull request #36461 from AnturK/broken-uplink-log

Fixes roundend report runtmining if no traitor had a uplink.
2018-03-19 21:07:18 -05:00
deathride58
082d36fa6b Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459
[MIRROR] Clown Ops
2018-03-17 23:58:15 +00:00
deathride58
50a05952d2 Merge pull request #5982 from Citadel-Station-13/upstream-merge-36475
[MIRROR] Fixed diseases getting negative points
2018-03-17 23:53:32 +00:00
vuonojenmustaturska
f0cb5fd3d8 Merge pull request #36475 from Cruix/disease_fix
Fixed diseases getting negative points
2018-03-17 08:25:17 -05:00
oranges
11d1119d6f Merge pull request #36409 from Cruix/disease_shuttle
Fixed cameras holding up the arrival shuttle
2018-03-17 07:53:44 -05:00