Commit Graph

8042 Commits

Author SHA1 Message Date
PKPenguin321
01d4d02b70 conflicts + undo loc changes
attackself/dragging the board now deletes it and spawns a new board of the proper type again instead of setting locs
2016-06-20 22:22:50 -07:00
oranges
e2718408df Merge pull request #18720 from Supermichael777/Flaps-fix
Makes beapsky able to use his room and all bots be able to use flaps
2016-06-21 09:35:15 +12:00
Supermichael777
f35a410ab6 Stupid github didnt show your coment the first time 2016-06-20 09:16:47 -04:00
Kyle Spier-Swenson
0d6bbbb412 stop the pills (#18703)
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
2016-06-20 12:07:44 +02:00
oranges
bce99c4f58 Merge pull request #18668 from coiax/dropdel
Adds DROPDEL flag; items will qdel() on dropped()
2016-06-20 11:08:31 +12:00
oranges
72371fcdc7 Merge pull request #18693 from Core0verload/list_overhead
Reduces list init overhead a tiny bit
2016-06-20 10:59:48 +12:00
Supermichael777
f6dd9cc402 Actualy fixes the bug because OBTUSE PROC NAMES. 2016-06-19 18:53:44 -04:00
oranges
448e386ac4 Merge pull request #18649 from Xhuis/my_eyes_have_seen_that_which_cannot_be_comprehended
Reagent tank optimization
2016-06-20 08:18:33 +12:00
oranges
7dc92e3f98 Merge pull request #18647 from TechnoAlchemisto/I_was_lucky_if_papa_went_for_me_first_because_then_at_least_I_would_be_too_disoriented_to_realize_what_he_was_doing_to_sis
Adds hard cider to the bar.
2016-06-20 08:18:05 +12:00
Joan Lung
20860f2d6a Merge pull request #18646 from Cruix/languages_split
Splits languages into languages_spoken and languages_understood.
2016-06-19 15:23:38 -04:00
unknown
4b396a52e7 Resolved conflicts 2016-06-19 15:07:36 -04:00
coiax
961a6c4c26 Adds potted plants to cargo packs (#18662)
🆑 coiax
rscadd: Potted plants can now be ordered from cargo.
/🆑
2016-06-19 14:05:18 -05:00
Cheridan
944b695ec3 Merge pull request #18660 from coiax/fix-17560
All living mobs can now attempt to pick up cards
2016-06-19 13:37:59 -05:00
Joan Lung
b941a47a60 Adds cogscarabs to clock cult (#18685)
* Adds cogscarabs to clock cult

* playstyle string

* info

* oh good going

* no static

* delay it eating all the metal

* scarab removal service

* cog

* ree

* error handling

* todo: languages = RATVAR

* isclockmob

* very large box

* faintly glowing eyes
2016-06-19 17:26:35 +02:00
WJohn
55428bb8ad Merge pull request #18593 from pudl/cool-carpet
Re-implements old carpet sprite
2016-06-19 08:20:02 -04:00
Supermichael777
a17e676f05 Such a hard fix pudl 2016-06-18 14:23:00 -04:00
c0
0abc91c59d slot_equipment_priority no longer contributes to list init overhead 2016-06-18 05:09:15 +03:00
c0
1311fb9b43 Reduces list overhead a tiny bit 2016-06-18 04:38:49 +03:00
unknown
706988154b Resolved conflicts 2016-06-17 18:56:51 -04:00
oranges
35faba0411 Merge pull request #18627 from coiax/fix-18276
Glowshrooms don't grow on lava or water
2016-06-18 10:35:59 +12:00
TechnoAlchemist
ecf0acd3bf Thanks Phil! 2016-06-17 13:34:41 -07:00
Jack Edge
a13719c17a Code review 2016-06-17 17:16:40 +01:00
Jack Edge
8ca69eabbb Adds DROPDEL flag; items will qdel() on dropped()
Pretty self explanatory, replaces writing a dropped() proc that just
calls qdel() with a flag that does it for you.
2016-06-17 12:14:28 +01:00
Jack Edge
64d6cb636c All living mobs can now attempt to pick up cards
Fixes #17560.

Removes ishuman() check, replaces with effective isliving() check, a la
paper bins.
2016-06-17 09:48:20 +01:00
Xhuis
2dd8617ced Grammar fixeroni 2016-06-17 00:18:37 -04:00
Xhuis
df08005b60 Two fixes 2016-06-17 00:13:17 -04:00
Xhuis
75d9e4174f [s] Lavaland Patch (#18398)
* Commit squash before update to master

* Removed repathing and slot machine shenanigans

* Legion spawn changes

* Map edits, round II

* Some changes

* Removes map changes, hopefully

* Conflicts 1

* Updates the maps

* Conflicts 2

* How about now?

* Remaps the colossus arena

* Restores old colossus spawning
2016-06-16 22:00:09 -05:00
PKPenguin321
3254e28a89 tweaks 2016-06-16 19:44:34 -07:00
PKPenguin321
c12f351e30 makes them go inside each other
;)
2016-06-16 18:59:12 -07:00
Xhuis
41935f8628 Reagent dispenser optimization and tweaks 2016-06-16 21:56:14 -04:00
oranges
8c9308acca Merge pull request #18613 from Core0verload/runtime_down
Puts down two runtimes
2016-06-17 13:40:03 +12:00
KorPhaeron
5fe4f395e9 Fulton Revival (#18480)
Miners can now purchase fulton extraction packs.
Miners can now purchase fulton medivac packs.
Two new fulton related bundles are available for purchase with vouchers.
2016-06-17 13:35:47 +12:00
unknown
f33a7efbf7 Resolved conflicts. 2016-06-16 19:10:07 -04:00
Xhuis
527dddd95d Complete Revenant Rewrite (#18522)
I'm unhappy with the way revenants are right now, and my code for them is pretty unsatisfactory in comparison to what I know now. Although revenants will still fill the same role of just being spookier ghosts, they'll be a bit more passive - incapable, for instance, of giving diseases to people. The new revenants will be called umbras and will use vitae instead of essence.

Total change list:

    Revenants have been renamed to umbras. Essence has been renamed to vitae. This may be temporary.
    Umbra spawn events are now weighted higher and spawn an unoccupied umbra. Ghosts are alerted to the umbra's position and may interact with it to take control of it.
    Umbras' health is not based on vitae but has a hard cap at 100.
    Umbras have a passive vitae drain each tick, defaulting at 0.01. If the umbra runs out of vitae, they will die irrevocably. They also slowly regenerate health by doing this.
    When an umbra dies, they leave behind umbral ashes that reform after one minute. They're difficult to see and can be scattered by activating them, although they also have high research levels if you're fast enough.
    Harvesting vitae from critical targets no longer kills them. Harvesting a target in general prohibits them from being harvested until five minutes later, but they can be drained again after that.
    EMPs revitalize umbras and give them hefty amounts of vitae due to their physical nature.
    Umbras have four abilities: Toggle Nightvision, Discordant Whisper, Possess, and Thoughtsteal.
        Toggle Nightvision is self-explanatory.
        Discordant Whisper is identical to the original revenant's transmit.
        Possess allows the umbra to slip into a human's body unnoticed. While in their body, umbras will slowly drain vitae from the human at a tiny rate - not enough to cause harm, but enough to induce adverse effects in the clueless human. These effects intensify over time and eventually lead to the umbra being forced out of their host.
        Thoughtsteal paralyzes a living human for several seconds while the umbra steals their memories. After several seconds, the umbra copies the notes of the target's memories and turns invisible - the hapless victim is stunned for several seconds afterwards and can't be Thoughtstolen by the same umbra again. Umbras have an objective to steal the memories of 25% of the station's population.
    Salt piles have been added, created by salt shaker or just by splashing salt. These piles will prevent an umbra from passing and reveal them briefly if they try.
2016-06-17 10:58:07 +12:00
oranges
d4769b4ee2 Safer input for the station charter (#18556)
Prevents html entities and sets a maximum length of 30
2016-06-16 23:51:10 +01:00
unknown
a0c866967f Splits languages into languages_spoken and languages_understood. 2016-06-16 18:50:32 -04:00
Cruix
ac0bad5d61 Added priority overlay system. (#18225)
Added priority overlays to atoms, which will not be removed when overlays are cut and will always remain on top when new overlays are added. This requires everyone to use add_overlay() and cut_overlays() instead of overlays += and overlays.Cut(). These procs are found in __HELPERS/icons.dm, and the priority overlay list is found in game/atoms.dm. Everything else is replacing deprecated overlay manipulation.
2016-06-17 10:11:53 +12:00
Core0verload
bb43219915 Rebalances radioactive microlaser (#18537)
This PR is aimed at making radioactive microlaser less useless.

Radioactive microlaser is now a subtype of health analyzer. Using it on someone would print out target's health status. Useful for stealth. You can disable this in microlaser's menu.

You can disable microlaser's irradiation in the same menu. Just in case you want to check your own health without carrying a real health analyzer.

Radioactive microlaser has it's max rad output increased 200%.

Radioactive microlaser cooldown is cut in two.
2016-06-17 09:11:52 +12:00
Jack Edge
7e7d3eb3ca Glowshrooms don't grow on lava or water
Also some tidying of glowshroom code, removes a spawn().
2016-06-16 19:18:08 +01:00
c0
458a38cf21 Puts down two runtimes 2016-06-16 06:46:26 +03:00
Joan Lung
2ae6b94ba9 Merge pull request #18581 from Cruix/tiny_carp_fix
Using a dehydrated carp no longer strips the neutral faction from the owner.
2016-06-15 22:01:03 -04:00
GunHog
f8eca8b465 Fixes my updates (#18578)
- Fixes ash plating upgrade item not deleting itself when used.
- Fixes research scanner icon being reverted
2016-06-16 13:53:29 +12:00
Joan Lung
71971c7c74 Removes Dementia Doctrine, moves Sigil of Submission to Scripts tier (#18569)
Removed Dementia Doctrine, replacing it with an Application sigil.

Adds the Sigil of Accession, the previously-mentioned Application sigil, which is much like a Sigil of Submission, except it isn't removed on converting un-mindshielded targets and will disappear after converting a mindshielded target.

Sigil of Submission is now a Script instead of a Driver; It's unlocked one tier up, so you have to rely on the Drivers you have until you get Scripts, instead of spamming both Driver sigils for free converts.

To replace Sigil of Submission in the Driver tier; Added Taunting Tirade, which is a chanted scripture with a very fast invocation, which, on chanting, confuses, dizzies, and briefly stuns nearby non-servants and allows the invoker a brief time to relocate before continuing the chant.

Fixes having too few components interrupting chanting.
2016-06-16 11:42:15 +12:00
Cheridan
7c3b95e7a4 Merge pull request #18570 from phil235/FixBundlenumberIdontevenremember
Fix bundle stuff: damage overlay, robotic augmentation, etc
2016-06-15 15:33:22 -05:00
pudl
8c7640ebd3 cool stuff! 2016-06-15 11:15:50 -05:00
unknown
bb10f6afb5 Using a dehydrated carp no longer strips the neutral faction from the owner. 2016-06-14 22:01:00 -04:00
PKPenguin321
90678607d4 Merge branch 'master' of https://github.com/tgstation/-tg-station into boardsmacked
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
2016-06-14 17:01:23 -07:00
PKPenguin321
ee2a964c07 new skateboard sprites 2016-06-14 16:52:24 -07:00
oranges
829243360d Merge pull request #18489 from Core0verload/ce_jetpack
Brings back CE's hardsuit jetpack
2016-06-15 10:44:59 +12:00
oranges
9c451faa2c Merge pull request #18534 from Core0verload/ash_fix
Fixes unkillable ash drake (+ more runtime fixes)
2016-06-15 10:44:20 +12:00