Commit Graph

2468 Commits

Author SHA1 Message Date
oranges
a899c28a24 Revert "Variable viewer always expands assoc lists" 2016-06-03 09:13:36 +12:00
oranges
fe25564d7f Merge pull request #18124 from coiax/assoc-view
Variable viewer always expands assoc lists
2016-06-03 09:12:01 +12:00
oranges
bf73e69dce Merge pull request #18141 from lzimann/temporarymarcial
Fix temporary martial arts not working properly when you already had another.
2016-06-03 09:10:40 +12:00
coiax
4d091c010e Adds Asteroid emergency shuttle to station (#18125)
Wow, this one is a WEIRD one.
2016-06-02 15:48:08 -05:00
oranges
16c77c484c Merge pull request #18118 from MMMiracles/pizzaparty
Lavaland Pizza Party
2016-06-02 13:40:08 +12:00
KorPhaeron
5db8a76217 Revert "Updates some lavaland ruins and adds new ones." 2016-06-01 16:47:16 -05:00
Lzimann
cf87aca7c3 Fix temporary martial arts not working properly 2016-06-01 18:45:23 -03:00
oranges
ce5bd19adb Merge pull request #18107 from lordpidey/lavaland_changes
Updates some lavaland ruins and adds new ones.
2016-06-02 09:07:32 +12:00
Jack Edge
12de9e28b1 Variable viewer always expands assoc lists
Quite often types are keys in lists as well as strings. I've checked, it
works fine, seems like a shame to lock it behind my datum antags PR so
here it is seperately.
2016-06-01 12:57:40 +01:00
AnturK
c6e47f3e19 Merge pull request #18110 from optimumtact/boomwire
Boom wires have rudimentary logging. (finishes bandit's work)
2016-06-01 09:46:59 +02:00
MMMiracles
a99e3d8c63 im on a roll and i haven't even submitted the pr yet 2016-05-31 21:26:31 -04:00
MMMiracles
5f773abf9b sorry timmy 2016-05-31 21:21:23 -04:00
oranges
079973558f Fix the admin log message for syndicate bomb logging 2016-05-31 22:18:53 +00:00
oranges
5aa4d2710d Merge pull request #18022 from Xhuis/kaput_bird
Fix bundle
2016-06-01 10:15:13 +12:00
Mike Long
cea21e4c57 Updates some lavaland ruins.
Adds lavaland wrath ruin.
Adds lavaland wrath ruin's reward.
Lavaland ruins can now cause sintouching.
2016-05-31 12:57:14 -04:00
oranges
96f74377b5 Merge pull request #17929 from coiax/zombie-bugs
Zombies are now a full subspecies
2016-05-31 11:52:59 +12:00
Jack Edge
1ba0fb5aee Infectious zombies are now a full subspecies
Fixes #17932

No more ""infection holder" bursts out of" memes, as zombie infection is
now done with a body egg in the head.

- Added 'romerol' a silent bioweapon reagent that adds the zombie
infection organ to a living person. This will lie dormant until they
die. Then they will stand up again.
- Zombie infection uses body_egg, meaning it shows up on healthHUDs.
- Zombies are now a full subspecies of humans, instead of
simple_animals. However, they should still be mostly the same, still
unable to pick up items, still zombify on attack and still able to claw
open doors.

Side Effects

- Zombies now take time to destroy tables
- Zombies can have their limbs cut off and be reduced to wandering
around being a bit pathetic. This is a feature.
- Zombies can be stunned and are vulnerable to stamina damage and
chemicals
- Zombies are armoured, but instantly die in crit, meaning they have
approximately 120 hp as before
- Zombie hands are just bloody hands, a proper sprite maybe sometime

gjkafldksfjkl
2016-05-31 00:15:10 +01:00
Cheridan
24b35d410a Merge pull request #18038 from phil235/RobustGrab
Make grab upgrade faster.
2016-05-30 17:02:59 -05:00
oranges
1ebc858091 Merge pull request #17962 from coiax/admin-logging
Adds admin logging to megafauna movement, shuttle loading
2016-05-30 11:00:14 +12:00
oranges
a01f6fbc74 Merge pull request #17995 from coiax/ministation-shuttle
Adds Ministation shuttle to shuttle templates
2016-05-30 10:55:56 +12:00
xxalpha
0d608250fa Changed AI core programming so it functions like the AI Upload. (#18004) 2016-05-30 10:54:50 +12:00
phil235
aab577aae7 Make grab upgrade faster. Passive -> Aggressive is instantaneous (unless you count the 1 second click cooldown, same as between two melee attacks). Upgrading to neck grab or kill grab now takes 3 seconds instead of 4. 2016-05-29 17:14:05 +02:00
Xhuis
d7c09927fa Fixes an issue with golems and conversion 2016-05-29 03:43:39 -04:00
Cheridan
6f329158cc Merge pull request #17973 from phil235/SpellMimeFix
Fixes latejoin mime's spells appearing unavailable when joining.
2016-05-28 23:55:34 -05:00
Jack Edge
3910a546e6 Adds admin logging to megafauna movement
🆑 coiax
rscadd: Admins are now notified if a megafauna uses a wormhole or a
shuttle.
rscadd: A new Shuttle Manipulator verb has been added for quick access
to probably the best and most bugfree feature on /tg/.
/🆑

Megafauna adminnotifies on portal TP

Standard shuttle names and logging

Also ignore .mdme files

Muh commit

Actually works and stuff
2016-05-28 16:26:28 +01:00
Jack Edge
37d84f7fc4 Adds Ministation shuttle to shuttle templates 2016-05-28 14:55:39 +01:00
Shadowlight213
ce01058e7c Fixes merge conflicts 2016-05-27 15:36:56 -07:00
phil235
d8488f09fd Fixes latejoin mime's spells appearing unavailable when joining. 2016-05-27 22:07:58 +02:00
Cheridan
f3ef584a6c Merge pull request #17835 from LanCartwright/chokingruntime
fixes choking.dm runtime due to new viruses
2016-05-27 14:56:10 -05:00
Cheridan
61c83be5d9 Merge pull request #17935 from KorPhaeron/thecure
Cures zombies
2016-05-26 20:13:55 -05:00
Cheridan
d5a95e093b Merge pull request #17896 from phil235/PullvsGrab
Merges Pull and Grab into a single functionality.
2016-05-26 15:51:46 -05:00
KorPhaeron
a78679a8c4 Fine keep your damn zombies 2016-05-26 14:10:59 -05: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
phil235
129295be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into PullvsGrab
Conflicts:
	code/__DEFINES/misc.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defines.dm
2016-05-25 23:48:00 +02: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
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
Xhuis
382c58cf23 Maybe now? 2016-05-24 18:25:20 -04: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
phil235
11ca987acb Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.
Two mobs can no longer pull the same mob at the same time. Pulling someone break any other pull/grab from other mob on that person.

The grab item is gone entirely.

You can now only grab one mob at a time, instead of two (one for each hand).

Being aggressively grabbed or more now counts as being restrained (like handcuffed). A neck grab or more makes you lie down and prevents you from getting up until the grab is broken.

Fixes movement when moving with a grabbed person.
Fixes movement when moving a pulled person around you diagonally.
Fixes neckgrab moving the victim on your turf even if the turf is dense.
2016-05-24 01:28:04 +02:00
oranges
ed80a9d1fd Merge pull request #17816 from Core0verload/fix_pack
Humble Fix Bundle
2016-05-24 09:26:03 +12:00
oranges
b82e4652d7 Merge pull request #17791 from coiax/fix-17790
Fixes #17790, and cleans up drone dispenser code
2016-05-23 17:49:33 +12:00
Cheridan
c94492664f MMmiracles away mission cleanup (#17873)
* MMmiracles away mission cleanup

* tomb ruin fix
2016-05-23 00:46:04 -05:00
Akke
62bdc2d859 changes to (sqrt(21+A.totalStageSpeed())/2)+(sqrt(16+A.totalStealth()*1)) sqrt(21+A.totalStageSpeed()*0.5)+sqrt(16+A.totalStealth()) 2016-05-22 22:34:08 +01:00
Xhuis
9db933124d Conflicts III 2016-05-22 15:05:00 -04:00
Shadowlight213
d2b5ed20f4 makes toggle purrbation work on angels 2016-05-21 20:38:24 -07:00
Akke
c74c17374a fixes choking.dm runtime due to new viruses 2016-05-21 23:53:47 +01:00
Jack Edge
4a76edf5fa Fixes #17790, and cleans up drone dispenser code
- Drone dispensers now run on a timer based system like what shuttles do.
- Fixed #17790, they now dispense drones.
- Fixed what was a probably really old bug in material containers that
no one's encountered before probably.
- Dispensers don't prompt you for sheet amounts, they eat them all like
an autolathe.
- Dispensers now, by default, only pump out three shells before pausing.
2016-05-21 11:27:12 +01:00
AnturK
c2e3a4d2b6 Merge pull request #17703 from coiax/eight-chamber-heart
Lungs and hearts for mutant species
2016-05-21 11:08:05 +02:00
c0
1af2a4722c Humble Fix Bundle 2016-05-21 04:05:32 +03:00
Iamgoofball
0f86c19460 Fixes another wrestling permaflip (#17777)
2 wrassle 5 me
2016-05-19 19:28:07 -05:00