Commit Graph

27484 Commits

Author SHA1 Message Date
Jack Edge 05d23faeaa Rounds no longer end instantly
I think I learned a valuable lesson today about how changing numerical
modes should be tested.
2016-05-26 16:43:24 +01:00
coiax 4483d5275c Shuttle manipulator (#17436)
* Starting out on our tgui journey

* God tgui, why do you need to be updated

You're dynamically generated anyway

* Commit of stuff

* Further progress is being made

* Everyone loves buildscripts

* Further modifications to my incredible running script

* Starting to modify the minimap code to be better

* It's going well thusfar, I guess

* What have I done

* RIP minimap

* FUN FUN FUN FUN FUN

* Adds shuttle_manipulator.dmi

MUH HOLOGRAMS

* Is it done? IS IT OVER

* Peer review

* Some bug fixes

* Makes that damn greentext shut up

* Shuttle registration

* Made the Emergency Escape Bar more robust

No climbing on the bar.

* Do not stare into the operation end of the device

* Compile shame

* THE MOST DUMB

* Passive barmaiden

* Emergency shuttle memes

* MORE SAFETY CODE

* Fancy shuttle manipulator icons

* Smoothing it out

* We are going to have a lot of fun with this one

* Independent blobbernauts

* WABBAJACK WABBAJACK

* Message for attempting to authenticate old style

* Angry alert noise is back

* Revert "Independent blobbernauts"

This reverts commit 34d6af7c9c88cfc2864990cb37b586bb90163dd3.

* No parrot sleep plz

* Moves the special shuttle stuff to special.dm

* No Bartender like a Centcom Bartender

* Non-controversial map changes

- Backup shuttle moved closer to Centcom main structure, docking tube
created
- Moved shuttle import landmark to above Centcom main building
- Added shuttle displays to Conference Room
- Squashed the Chapel a bit in Metastation
- Made the docking port on Z2 massive
- Made the docking port on Metastation a lot larger

* Hacks and slashes at Box

A bunch of things are extended and squashed so Box shuttle dock can
support the MetaStation emergency shuttle.

* Some Metastationshit

* Never ending changes

* Wabbajack to TGM

* Modified the bar, I think that's all of them

* Stops Barmaiden wandering around

* More code review

* Whitspace, the bane of us all

* DIE WHITESPACE DIE
2016-05-26 15:15:19 +02:00
Razharas 1393b64aeb Merge pull request #17906 from coiax/no-react-refactor
Refactors NOREACT flag; minor cig refactor
2016-05-26 16:09:57 +03:00
Jack Edge bc113b6aa2 Refactors NOREACT flag; minor cig refactor
The reagents datum now has its own flags, which currently includes
REAGENT_NOREACT, which functions in the same way. Shouldn't be touched
directly, use set_reacting(bool) to modify it, as modification also adds
or removes the reagents datum from the SSobj.processing list.

Also refactors cigs a little, adds a Destroy(), uses the open_flame()
proc for the hotspot exposure.
2016-05-26 10:12:59 +01:00
Jordie 91e7bd52ac Merge pull request #17909 from KorPhaeron/brain
Fix for fiery dismemberment
2016-05-26 10:13:35 +10:00
coiax 57f22f8375 Swarmer teleport refactored; handcuff message fix (#17913)
Fixes #17912.

🆑
bugfix: Fixes a bug where swarmers teleporting humans would incorrect
display a visible message about restraints breaking.
/🆑

- Added a find_safe_turf() global proc in teleport.dm
- Also rewrote it to involve less awful indent chains
- Removed a trailing return for Remie
2016-05-25 23:06:44 +02:00
Joan Lung b19fbc4c5d Tweaks some layering (#17900) 2016-05-25 22:42:48 +02:00
Joan Lung e021806f4c Swooping drakes are now properly immune to damage (#17893) 2016-05-25 22:41:19 +02:00
oranges bc61c8a13d Merge pull request #17904 from coiax/renaming-the-annoying-ones
Renames files under code/ with naughty characters
2016-05-26 01:39:56 +12:00
oranges 34e8a1f100 Merge pull request #17915 from tgstation/RemieRichards-lists
Adds a DEFAULTPICK() macro, updates an old list helper
2016-05-26 01:39:26 +12:00
Nyvrem 19caf6c130 Fixes mop wetness stacks (#17850)
* Fixes mop wetness stacks

Mops currently apply ten times as much liquid as they use and because wetness and lube and the such now stacks this means when you apply something with a mop it takes ten times as long to dry as it would otherwise.

* Fixes lacking wetting
2016-05-25 13:23:54 +02:00
Cheridan c3df38a2bc Merge pull request #17926 from coiax/fix-17925
Fixes observers being called ghost
2016-05-25 01:37:09 -05:00
Cheridan 92d1ae5a4b Merge pull request #17881 from coiax/time-of-death
Polymorph bugs, time since death, groundwork laid
2016-05-25 01:29:44 -05:00
Jack Edge 5478a81ee4 foodndrinks to food_and_drinks 2016-05-25 06:26:28 +01:00
Jack Edge 6923c67cf0 Fixes observers being called ghost
Fixes #17925.
2016-05-25 06:15:19 +01:00
Xhuis 382c58cf23 Maybe now? 2016-05-24 18:25:20 -04:00
Cheridan e2d231f918 Merge pull request #17890 from coiax/ghost-names
Ghost name QoL changes
2016-05-24 17:12:43 -05:00
Remie Richards 20e001a8b8 adds one more layer of parenthesis I forgot, cos it worries me to leave it out. 2016-05-24 19:35:32 +01:00
Remie Richards 433bfdba5f Adds a DEFAULTPICK() macro, updates an old list helper
* DEFAULTPICK() Picks from the list, with some safeties, and returns the "default" arg if it fails
* get_key_by_index() didn't need to be as slow as it was, and now it isn't, it's also a macro now KEYBYINDEX()
2016-05-24 19:31:56 +01:00
Cheridan 6d6711facb Merge pull request #17822 from optimumtact/keepphilfromkillinme
MakeSlippery proc made more readable with named arguments
2016-05-24 11:59:24 -05:00
Jack Edge d29af3a94b Independent blobbernauts 2016-05-24 17:28:34 +01:00
Jack Edge afd9720abc Polymorph bugs, time since death, groundwork laid
🆑 coiax
fix: Fixes bug where bolt of change to the host would kill an attached
guardian.
fix: Fixes bug where bolt of change to laughter demon would not release
its friends.
fix: Fixes bug where bolt of change to morphling would not release its
contents.
fix: Fixes bug where bolt of change transforming someone into a drone
would not give them hacked laws and vision.
rscadd: Medical scanners now inform the user if the dead subject is
within the (currently) 120 second defib window.
/🆑

- Also laid the groundwork for force pushing ghosts back into bodies
when defibbing, along with standardising the ghost back into body
process.
- Defib limit and defib brain loss times are now #defines.
2016-05-24 17:28:34 +01:00
KorPhaeron 7d51772b39 Fix for fiery dismemberment 2016-05-24 10:52:42 -05:00
AnturK 7041152a37 Merge pull request #17846 from Incoming5643/patch-7
Flips the bird
2016-05-24 17:47:15 +02:00
AnturK 802cdf9f5c Merge pull request #17839 from optimumtact/watisgoinon
Fix an antipattern when using canUseTopic
2016-05-24 17:46:11 +02:00
AnturK 895406cd36 Merge pull request #17428 from Dahka/New_Syringes
Adds three new syringes
2016-05-24 17:37:40 +02:00
Jack Edge 0d6841b1ac Made Restore Ghost Character affect deadchat only
Instead of altering the name of the ghost mob and mind, now it just lets
you babble in deadchat using your regular name with a special var.
2016-05-24 15:04:04 +01:00
Jack Edge 7f49175967 Renames files under code/ with naughty characters
Like seriously, don't use spaces in file names, this is a codebase,
they're annoying. Hopefully Github will show these renames correctly.
2016-05-24 12:16:19 +01:00
Cheridan e4755a8d4b Merge pull request #17859 from Iamgoofball/patch-45
SNPC's now have a much lower chance of being able to talk
2016-05-24 00:48:43 -05:00
Jordie 92f9f375c1 Merge pull request #17864 from ChangelingRain/stopcuckingthecult
Makes the cult less likely to accidentally cuck itself
2016-05-24 10:48:00 +10:00
Jordie fa19b3a985 Merge pull request #17853 from ChangelingRain/suicidalshade
Shades cannot suicide inside soulstones
2016-05-24 10:47:47 +10:00
Joan Lung e84f0ca865 Merge pull request #17895 from GunHog/It_Was_Probably_My_Fault_Anyway
[s] Fixes Antag status showing for Diagnostic HUD mobs.
2016-05-23 19:06:40 -04:00
GunHog 38c9084150 Fixes Antag status showing for Diagnostic HUD mobs
ANTAG_HUD and DIAG_BOT_HUD were set to the same define.
2016-05-23 17:54:27 -05:00
Jack Edge 9a15d97046 Ghost name QoL changes
🆑 coiax
rscadd: Ghosts now have the "Restore Character Name" verb, which will set
their ghost appearance and name to their character preferences.
bugfix: Mob spawners now give any generated names to the mind of the
spawned mob, meaning ghosts will have the name they had in life.
the outsiders as they see fit.
/🆑

...

fsdjkafklasdfljk
2016-05-23 23:00:26 +01:00
oranges e7d5b506ee Merge pull request #17522 from Bobylein/chem_master-tgui
Converted chemmaster to TGUI
2016-05-24 09:39:17 +12:00
Joan Lung 80774c0408 Merge pull request #17847 from lordpidey/demonbomb
Removes devil immunity to explosions.
2016-05-23 17:31:08 -04:00
oranges ed80a9d1fd Merge pull request #17816 from Core0verload/fix_pack
Humble Fix Bundle
2016-05-24 09:26:03 +12:00
Cheridan 47f6d58a2a Merge pull request #17886 from coiax/fix-spraaaaa
Fixes some last minute spraycan bugs
2016-05-23 15:26:49 -05:00
Kevin 540300939f Merge remote-tracking branch 'refs/remotes/tgstation/master' into chem_master-tgui
# Conflicts:
#	tgui/assets/tgui.js
2016-05-23 21:33:35 +02:00
Cheridan 603e7be1c8 Merge pull request #17868 from tgstation/SpaceFix
Makes space 250 times less potent
2016-05-23 14:28:44 -05:00
Jack Edge 1c92b17e3d Fixes some last minute spraycan bugs
- Cyborgs can now use their spraycans
- Spraycans are different colours
2016-05-23 20:26:40 +01:00
Cheridan 7f3cb0de5a Merge pull request #17815 from coiax/spraycan-of-doom
Refactors crayons and spraycans
2016-05-23 13:49:44 -05:00
Jack Edge 6914282b9f Code review 2016-05-23 19:35:01 +01:00
Cheridan 657ff5664e Merge pull request #17874 from optimumtact/hashbrown
Allow handlewet to queue ticks properly
2016-05-23 13:33:16 -05:00
Steelpoint 3f50399bda Red Security Sprites (#17784)
* InitalCommit

* MergeConflict
2016-05-23 11:04:52 -05:00
oranges ee9443e2c2 Merge pull request #17826 from xxalpha/bebebebenukesandshit
Clean up plutonium core a bit
2016-05-23 21:01:24 +12:00
oranges bc3bdfce2e Allow handlewet to queue ticks properly
hash check is working by obj name, not reference, so most handle_wet doesn't get queued
2016-05-23 08:19:51 +00:00
oranges ccf693ae44 Merge pull request #17819 from Core0verload/toolbox_arm
[#17310 Re-Open] "Toolbox Arm" printable at exosuit fabricators and protolathes
2016-05-23 20:06:34 +12:00
oranges a18af978e8 Revert "Remove the unique hash check for HandleWet"
Yeah great job github, just arbitrairly change how a UI works just because I got a maintainer bit

This reverts commit 39abb77bac.
2016-05-23 07:32:40 +00:00
oranges 39abb77bac Remove the unique hash check for HandleWet
I don't believe it was functioning as expected.
2016-05-23 19:29:38 +12:00