Commit Graph

25479 Commits

Author SHA1 Message Date
oranges 75575f4ae8 Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay
Replace area-wide fire overlay with reddening the lights
2018-06-12 11:48:47 +12:00
oranges fb6a61b5cb Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-12 11:48:21 +12:00
oranges 9b3561e805 Merge pull request #38382 from AutomaticFrenzy/patch/squash-no-markup
Make chat squashing HTML-agnostic II
2018-06-12 11:46:37 +12:00
oranges 124d9b081c Merge pull request #38380 from AutomaticFrenzy/patch/vr-plasmemes
Give plasmamen their plasma suits in VR
2018-06-12 11:46:26 +12:00
oranges 5a079bae42 Merge pull request #38378 from AutomaticFrenzy/patch/deaf-borg-mods
Fix deaf people hearing borg modules going offline
2018-06-12 11:45:56 +12:00
Jordan Brown 88cad42812 Merge pull request #38381 from AutomaticFrenzy/patch/orb-of-confusion
Fix legion cores not healing confusion
2018-06-11 16:51:02 -04:00
AnturK 7f887bc4ea Removes doubled iaa definition. 2018-06-11 22:16:10 +02:00
AnturK fd656d3623 Fixes nuke exploding instantly. (#38417) 2018-06-11 17:16:00 +03:00
ShizCalev 753752180c Makes swimsuits underwear (#38372) 2018-06-10 22:13:51 -07:00
fludd12 b2e9fe8728 Fixes and Upgrades Stabilized Gold Extracts (#38394)
* Fixes and Upgrades

* I Forgot To Sync This Whoops

* If You Say So
2018-06-10 22:03:55 -07:00
Jordan Brown 4d69d36b9a Merge pull request #38379 from MrStonedOne/fasternotes
Fixes note/message interface flooding the string tree.
2018-06-10 11:50:51 -04:00
AnturK 8c606af6cf Squashes traitors under one path (#38332) 2018-06-10 03:05:53 -07:00
kevinz000 c38e4c938d Make incendiary armor aspawn only (#38370) 2018-06-10 02:56:39 -07:00
AnturK f7cf151e92 Fixes loading zlevels with static lighting. (#38365)
* Fixes loading zlevels with static lighting.

* Actually this whole part is unnecessary now because change turf handles the change properly now.

* Correct
2018-06-10 02:54:53 -07:00
ShizCalev 3abd2b6d27 Cleans up logging 2018-06-09 15:51:58 -04:00
MrStonedOne 0814e09bd5 Fix warning. 2018-06-09 11:24:34 -07:00
Jordan Brown 9a5859a977 Merge pull request #38358 from nfreader/record_crimes
Logs minor and major crimes
2018-06-09 13:21:36 -04:00
Jordan Brown 7accb5b093 Merge pull request #38361 from AnturK/yeahno
Removes unused overview code.
2018-06-09 13:20:06 -04:00
Tad Hardesty ae5c744b54 Make chat squashing HTML-agnostic 2018-06-09 02:45:56 -07:00
Tad Hardesty f3ae5a1a67 Fix legion cores not healing confusion 2018-06-09 01:55:59 -07:00
Tad Hardesty 8c515d8d99 Give plasmamen their plasma suits in VR 2018-06-09 01:17:14 -07:00
MrStonedOne 7f323c1dfe Fixes note interface flooding the string tree. 2018-06-08 23:42:57 -07:00
Tad Hardesty 86a0056057 Fix deaf people hearing borg modules going offline 2018-06-08 23:29:14 -07:00
ShizCalev 340f266ece Revert "Makes swimsuits underwear options" (#38371)
This reverts commit 24685cd93c.
2018-06-09 04:21:57 +03:00
ShizCalev 24685cd93c Makes swimsuits underwear options 2018-06-08 21:16:56 -04:00
Tad Hardesty 5f650ac7ac Replace area-wide fire overlay with reddening the lights 2018-06-08 14:17:16 -07:00
AnturK aa04346864 Init time list on every mob! 2018-06-08 22:56:27 +02:00
Tlaltecuhtli 2bc1f5e31f fixes spiders not making webs (#38344)
* fixes spiders not making webs

* r
2018-06-08 14:17:03 -04:00
81Denton 115ff7f6f1 Runtimestation tweaks (#38340)
* runtimestation tweaks, debug subtypes

* moves exposed wire to maint tunnel
2018-06-08 10:51:00 -07:00
Jordan Brown 665e593e8e Merge pull request #38342 from ShizCalev/donk-fix
Corrects Donk Co
2018-06-08 13:03:51 -04:00
Nick Farley 29a32a7348 More key_names 2018-06-08 13:01:58 -04:00
Nick Farley 5fcbf9d628 [key_name(usr)] 2018-06-08 12:38:50 -04:00
Nick Farley c644a56406 grab correct vars for HUDs 2018-06-08 11:55:59 -04:00
Nick Farley 7fee2a17bb Logs minor and major crimes
Simply adds minor and major crimes to the records.html investigate log
2018-06-08 11:32:14 -04:00
oranges 76f3deaa98 Add kahki pants to the sec wardrobe (#38328) 2018-06-08 10:41:49 -04:00
deathride58 c5a0e14acb Tones down values for a lot of different hotspot_expose calls (#38232)
* Tones down values for a lot of different hotspot_expose calls

* Update LINDA_fire.dm (#38217)

* Automatic changelog compile, [ci skip]

* Slight changes to camera network code (#38223)

* Removes a useless var and corrects two cameras to use the automatic naming system to reduce dv usage.

* Damn github didnt notice this was here....

* Fixes datediff not returning (#38215)

* Fixes pocket items being deleted when monkeyizing (#38220)

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

* readds atmos heating from hotspot_expose(), as requested by naksu

* Tones down hotspot_expose values for sparks moving and destroying

* tones down item heat by a lot. no more burning your face off after smoking a cigarette
2018-06-08 15:53:10 +03:00
fludd12 0d429e01b8 [READY][FINALLY] Various Crossbreed Updates (#38039)
* A Variety Of Updates

* Lovey Sprites!

* Adds implementation for listening status effects.

* Fixes implementation, uses defines instead of magic strings.

* Completely reworks status effect listeners

* Fixes Love Potions

* Fixes Approximately All The Things.jpg
2018-06-08 15:51:03 +03:00
AnturK 8140d95758 High Gravity - First Draft (#38043)
* High Gravity - First Draft

* Replaces has_gravity defines for areas.

* Default gravity ztrait

* Adds some gravity effect and skips damage at gravity = 2

* Paralysis icon

* Antigravity grenades for some abuse

* Makes the damage treshold a define and makes alert description more accurate.

* Bluh
2018-06-08 15:48:07 +03:00
81Denton 02a076d2ee Uses defines for vending machine access (#38336)
* Uses defines for vending machine access

* delet
2018-06-08 15:46:03 +03:00
AnturK 8ff8380a5d Fixes fires breaking indestructible turfs. (#38335) 2018-06-08 15:45:28 +03:00
deathride58 9df53fd8c7 Revert "makes tech point gen from rad collectors less useless" (#38345) 2018-06-08 15:43:46 +03:00
vuonojenmustaturska cde5c2714e Fixes temperature guns to respect armor/dodge (#38243)
* henk

* do these return values even matter?
2018-06-08 13:06:24 +02:00
AnturK 04e3af6abc Fixes jaunter emp effect. (#38331)
* Fixes jaunter emp effect.

* Sure
2018-06-08 14:05:57 +03:00
Tad Hardesty eb53ea3ede Fix the BoH singularity messaging admins every time (#38334) 2018-06-08 12:58:12 +03:00
Tad Hardesty 78456aae3b Fix meson goggles and lantern wisps conflicting (#38211) 2018-06-07 21:33:22 -04:00
Tad Hardesty 9c97ea7f05 Fix pAI suicide while in holoform deleting the card (#38279) 2018-06-07 21:06:27 -04:00
Kraseo a957153024 a slippery slope into h*ck (#38303) 2018-06-07 21:00:17 -04:00
Iamgoofball b6e4bde3f8 Fixes Lisa's description (#38320) 2018-06-07 20:53:42 -04:00
Tad Hardesty cff3335ed3 Remove mobs from idle NPC pool on Destroy (#38333)
* Remove mobs from idle NPC pool on Destroy

* Combine simple_animal Destroy procs
2018-06-07 17:07:05 -05:00
ShizCalev 0982824eff Corrects Donk Co 2018-06-07 13:26:21 -04:00