Commit Graph

5526 Commits

Author SHA1 Message Date
deathride58
3a5fbcf15e Update _unit_tests.dm 2018-03-20 11:11:41 -04:00
Emmett Gaines
0832bb62c3 Unit test to make sure all subsystems which initialize call parent 2018-03-20 08:02:17 -05:00
CitadelStationBot
9f182d89ed [MIRROR] Distinguishes law types by colour (#6022)
* Distinguishes law types by colour

* merge conflict
2018-03-19 22:17:24 -05:00
CitadelStationBot
7b3b1f65ec [MIRROR] Adds two new intermediate beaker types to chemistry (#6018)
* Adds two new intermediate beaker types to chemistry

* YAY I DON'T HAVE TO KEEP UP WITH SNOWFLAKE ANYMORE

* Update all_nodes.dm
2018-03-19 22:17:05 -05:00
CitadelStationBot
7c8c8f3a0a [MIRROR] Engie goggles in Meson mode now respect light levels (#6028)
* Engie goggles in Meson mode now respect light levels (#36504)

* Engie goggles in Meson mode now respect light levels

Meson glasses show the surrounding terrain, but darken areas beyond line of sight and that are not lit. Engineer goggles set to Meson mode currently show all terrain at max brightness. As a result, it can be hard to even know an area is unlit until objects (or mobs) suddenly start popping in one tile away.

This change makes the Engineer goggles respect light levels like Meson glasses do.

An image for visual aid;
https://i.imgur.com/KdYmkZb.png
Left shows the current Engineer goggles. Right shows the current Meson glasses, and how the Engineer goggles will look with this change.

* Update engine_goggles.dm

* Engie goggles in Meson mode now respect light levels
2018-03-19 21:44:30 -05:00
CitadelStationBot
0016b323f6 [MIRROR] Lowers damage cap on breaking hacked apcs (#6026)
* lowers damage cap on breaking apcs (#36520)

* Lowers damage cap on breaking hacked apcs
2018-03-19 21:44:19 -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
980d69dde3 [MIRROR] I'm a dumb idiot and forgot to change the antag_rep values (#6000)
* I'm a dumb idiot and forgot to change the antag_rep values

* merge conflict
2018-03-19 21:25:01 -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
9338d18a28 [MIRROR] Techweb fixes (#6023)
* Techweb fixes (#36513)

* Techweb fixes

* board

* robo

* Techweb fixes
2018-03-19 21:18:35 -05:00
CitadelStationBot
b74454bf5c [MIRROR] Tweaks to ERT creation (#6021)
* inquisition ert tweak (#36511)

* Tweaks to ERT creation
2018-03-19 21:18:02 -05:00
CitadelStationBot
889ff6fa08 [MIRROR] circuit diagnostic status icon changes (#6019)
* circuit diagnostic status icon changes

* circuit diagnostic status icon changes (#36218)

* circuit diagnostic hud revisit

warning icon replaced with red versions of prefered icons, new icons added to the AR interface

* did this fix it?

* ok how about now

put all the new icons at the end of the file instead of at different places inside
2018-03-19 21:16:26 -05:00
CitadelStationBot
df15bbe0f0 [MIRROR] New & Fixed AI VOX Sound Files (#6003)
* New & Fixed AI VOX Sound Files

* Update vox_sounds.dm
2018-03-19 21:15:34 -05:00
CitadelStationBot
1d6d8b454c [MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017)
* Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE

* FUCK (#36483)

F A L S E
semicolon be gone
2018-03-19 21:12:46 -05:00
CitadelStationBot
0c1fc7ff61 [MIRROR] Gives warning message to holodeck mobs that gain sentience via sentience potions. (#6016)
* Adds warning message to holodeck mobs that are made sentient. (#36472)

* Gives warning message to holodeck mobs that gain sentience via sentience potions.
2018-03-19 21:12:21 -05:00
CitadelStationBot
009f95db42 [MIRROR] Electronic assembly changes and additions (#6014)
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 21:11:23 -05:00
CitadelStationBot
6aaef3b010 [MIRROR] Adds mineral storage access to all jobs intended to be using a technology fabricator[read: 80% of the jobs] (#6013)
* Adds mineral storage access to all jobs intended to be using a technology fabricator[read: 80% of the jobs]

* RND techwebs: Mineral access (#36387)
2018-03-19 21:08:54 -05:00
CitadelStationBot
fd63838558 [MIRROR] Circuits constants chips now keep their data on save/load (#6012)
* Circuits constants chips now keep their data on save/load

* Fixes constants chips (#36315)
2018-03-19 21:08:24 -05:00
CitadelStationBot
e6cee90e4c [MIRROR] Adds missing space to lobby music toggle (#6010)
* Adds missing space to lobby music toggle

* Adds missing space to lobby music toggle (#36517)
2018-03-19 21:07:36 -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
CitadelStationBot
26e1aec9d8 [MIRROR] Massively slows Spaceacillin metabolism (#6005)
* Massively slows Spaceacillin metabolism

* Update medicine_reagents.dm
2018-03-19 21:06:56 -05:00
CitadelStationBot
c17da68be6 [MIRROR] Removes completely unnecessary block of code in reactions.dm (#6007)
* Removes completely unnecessary block of code in reactions.dm

* removes block of code (#36474)
2018-03-19 21:06:01 -05:00
deathride58
02c3f6d0a0 Merge pull request #5985 from Citadel-Station-13/upstream-merge-36399
[MIRROR] Fixes the tesla coil research screwdrivering
2018-03-18 00:18:55 +00: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
087255b1f1 Merge pull request #5904 from Poojawa/sprite-tweaks
Ckey locks on Sprite_accessories!
2018-03-17 23:57:16 +00:00
deathride58
f74aa475c1 Merge pull request #5988 from Citadel-Station-13/upstream-merge-36449
[MIRROR] Chem dispenser upgrade
2018-03-17 23:55:32 +00:00
deathride58
79db79f630 Merge pull request #5987 from Citadel-Station-13/upstream-merge-36437
[MIRROR] Tesla coils and grounding rods actually shock buckled mobs.
2018-03-17 23:54:50 +00:00
deathride58
a9f8c70d62 Merge pull request #5986 from Citadel-Station-13/upstream-merge-36364
[MIRROR] Changes stormtrooper ammo to 10g slugs
2018-03-17 23:54:33 +00:00
deathride58
d2926f3ba9 Merge pull request #5984 from Citadel-Station-13/upstream-merge-36470
[MIRROR] Fixes admins not working in certain cases
2018-03-17 23:54:16 +00:00
deathride58
df8fe921cc Merge pull request #5983 from Citadel-Station-13/upstream-merge-36478
[MIRROR] Gibs admin observers follow links
2018-03-17 23:53:57 +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
deathride58
d30be811be Merge pull request #5979 from Citadel-Station-13/upstream-merge-36410
[MIRROR] Fixes dupe and runtime issues with Rod of Asclepius
2018-03-17 23:52:52 +00:00
deathride58
8b2aa30d6f Merge pull request #5977 from Citadel-Station-13/upstream-merge-36443
[MIRROR] Makes vanilla ice cream... require vanilla!
2018-03-17 23:51:37 +00:00
deathride58
238c8b24e2 Merge pull request #5974 from Citadel-Station-13/upstream-merge-36425
[MIRROR] Sec officers always like donuts
2018-03-17 23:50:30 +00:00
deathride58
b8d6bc53cf Merge pull request #5973 from Citadel-Station-13/upstream-merge-36432
[MIRROR] Fixes brain damage json runtime
2018-03-17 23:50:10 +00:00
deathride58
f5e49123e0 Merge pull request #5971 from Citadel-Station-13/upstream-merge-36409
[MIRROR] Fixed cameras holding up the arrival shuttle
2018-03-17 23:49:23 +00:00
deathride58
1fc5fe361c Merge pull request #5970 from Citadel-Station-13/upstream-merge-36393
[MIRROR] Fixes bluespace radio potions
2018-03-17 23:49:02 +00:00
deathride58
b9a73ded87 Update coil.dm 2018-03-17 19:48:42 -04:00
deathride58
b0f4508392 Merge pull request #5967 from Citadel-Station-13/upstream-merge-36130
[MIRROR] [READY] Refactors wet floors to a component
2018-03-17 23:47:15 +00:00
vuonojenmustaturska
aceed22b76 Chem dispenser upgrade 2018-03-17 10:10:20 -05:00
RandomMarine
c1e897b298 Tesla coils and grounding rods actually shock buckled mobs. (#36437)
* coils and grounding rods shock buckled things

* general tesla buckle shock proc
2018-03-17 08:49:38 -05:00
81Denton
f82456fd7f Changes stormtrooper ammo to 10g slugs (#36364)
* pulse slug instead of buckshot

* 10 gauge baby

* 10g name
2018-03-17 08:47:24 -05:00
vuonojenmustaturska
a4e10653c7 Fixes the tesla coil research screwdrivering 2018-03-17 08:30:54 -05:00
Kyle Spier-Swenson
67d7cf3477 Fixes admins not working in certain cases (#36470)
* Fixes admins not working in certain cases

>admin doesn't get rank because of casing issue.

* put this in the wrong place
2018-03-17 08:26:37 -05:00
vuonojenmustaturska
aea919e4ec Merge pull request #36478 from MrStonedOne/patch-495
Gibs admin observers follow links
2018-03-17 08:25:25 -05:00
vuonojenmustaturska
f0cb5fd3d8 Merge pull request #36475 from Cruix/disease_fix
Fixed diseases getting negative points
2018-03-17 08:25:17 -05:00
TheDreamweaver
49a772b6b7 Fixes dupe and runtime issues with Rod of Asclepius (#36410)
* Fixes bug with duplicating rod on removal while lying down, as well as implemented a new force_put_in_hand() proc, and cleaned up some code.

* Merged force_put_in_hand() with put_in_hand() and cleaned up code.
2018-03-17 08:22:38 -05:00
vuonojenmustaturska
2d8258057b Merge pull request #36443 from ShizCalev/vanilla-icecream
Makes vanilla ice cream... require vanilla!
2018-03-17 08:21:17 -05:00
vuonojenmustaturska
75088e9b36 Merge pull request #36425 from Shadowlight213/donutsec
Sec officers always like donuts
2018-03-17 07:54:12 -05:00
oranges
9ea4bd45c2 Merge pull request #36432 from ShizCalev/braindamageeventruntime
Fixes brain damage json runtime
2018-03-17 07:54:04 -05:00