Commit Graph

7162 Commits

Author SHA1 Message Date
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
d31b57f5a5 Merge pull request #17983 from PKPenguin321/patch-5
normal revives cure viruses again
2016-05-30 10:58:32 +12:00
oranges
444748190a Merge pull request #17991 from coiax/fix-17990
Ghost sword orbits on button click, added URL, POI
2016-05-30 10:55:18 +12:00
kevinz000
c88c964f26 Minor Tweaks for PK borgs + recharger (#17940)
Cyborg rechargers now recharge a minimum of 200/tick, up from a default setting of 20/tick
PK borg cookie dispensers now have a 1 second cooldown
PK borg hug shocks has a 2 second cooldown up from 1
Cyborg hyposprays now log
PK borg harm alarm emagged will no longer stun you if you have bowman headset
PK borgs are the only cyborgs that can hugshock and hugcrush (I added hugs for it, medborgs, and standard borgs
2016-05-30 10:52:52 +12:00
Joan Lung
ff4863b188 Merge pull request #18002 from phil235/CocoonAbuseFix
Fixes exploit with cocooning a dragged mob.
2016-05-29 13:19:27 -04:00
Razharas
ddfd8f6f35 Merge branch 'master' of https://github.com/tgstation/-tg-station 2016-05-29 05:54:57 +03:00
Joan Lung
e5618e40d0 Ensures Legional continuality (#17972)
* Ensures Legional continuality

* Fixes a bug

* two legions and both of them want you dead
2016-05-28 16:29:37 -05:00
Joan Lung
04f45cfe14 Merge pull request #17922 from Xhuis/momentous_face
Clockwork Cult Patch I
2016-05-28 15:58:16 -04:00
phil235
af2bac81b7 Fixes exploit with cocooning a dragged mob. 2016-05-28 19:04:11 +02:00
coiax
d15e4dec13 Removes dragon's blood drop (#18001)
[s]Removes dragon's blood drop
2016-05-28 11:47:42 -05:00
Lularian
8aa135f470 fixes some of the crap maybe 2016-05-28 11:08:46 -05:00
Jack Edge
be3a3a8e6c Make all ghosts normal again on sword destruction 2016-05-28 16:33:25 +01: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
Joan Lung
325d8aa807 Merge pull request #17954 from GunHog/Head_Megaphones_100_Percent_Meme_Free
Head Megaphones + Megaphone changes
2016-05-28 10:40:31 -04:00
phil235
1f0b53803e Can't break the pull while stunned or unconscious anymore. (#17992) 2016-05-28 08:36:42 -05:00
Jack Edge
a677973a56 Ghost sword orbits on button click, added URL, POI
🆑 coiax
rscadd: Spectral sword is now a point of interest for ghosts.
fix: Clicking the spectral sword action now orbits the sword, instead of
just teleporting to its location.
/🆑

Changed the notify_jump alert to notify_action, added three different
notification actions (jump, attack, orbit), modified notify_ghosts and
its callers appropriately.

Spectral sword now just counts the number of orbiting ghosts in the
turf, irregardless of what they're orbiting. Generally this'll be the
summation of orbiters of the mob, and orbiters of the sword.
2016-05-28 12:23:24 +01:00
oranges
9a30d223b3 Merge pull request #17952 from coiax/fix-17950
Removes SHUTTLE_* defines being numeric
2016-05-28 20:09:19 +12:00
Cheridan
b6c956e294 Merge pull request #17059 from Shadowlight213/Archangel
[Review Ready]Wing mutant body parts and Angel wings
2016-05-28 01:16:16 -05:00
Xhuis
19644c8e53 Does some stuff, I forget what 2016-05-28 00:42:08 -04:00
PKPenguin321
9ed750de59 normal revives cure viruses again
Fixes https://github.com/tgstation/tgstation/issues/17931
2016-05-27 21:30:21 -07:00
Xhuis
de1eea773e Adds some missing arguments to stun overrides 2016-05-27 23:17:29 -04:00
Remie Richards
80b4c3ca7f Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui
Conflicts:
	tgui/assets/tgui.css
	tgui/assets/tgui.js
2016-05-28 00:24:58 +01:00
Shadowlight213
ce01058e7c Fixes merge conflicts 2016-05-27 15:36:56 -07:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02:00
Joan Lung
b61d1fd81f Merge pull request #17941 from Cheridan/cleaning_vomit
Ends Flyman Starvation
2016-05-27 16:14:03 -04:00
Cheridan
2e74d742ad Themself 2016-05-27 14:08:47 -05:00
Cheridan
e92a4bc744 no src 2016-05-27 14:03:22 -05:00
Cheridan
61c83be5d9 Merge pull request #17935 from KorPhaeron/thecure
Cures zombies
2016-05-26 20:13:55 -05:00
GunHog
fc386b3b0c Megaphones fix
Megaphones now use say() instead of a custom override.
say() verb for living mods now accept spans as a third argument.
2016-05-26 17:54:46 -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
Jack Edge
78384666b1 Removes SHUTTLE_* defines being numeric
Wew, there was a lot to change. Fixes #17950. There is a lot of gamemode
code here, so I'm not entirely sure if this is ultimately worth it.
2016-05-26 18:16:45 +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
Cheridan
0664f17c34 Makes flies only barf 1 tile ahead
2 tiles was too fun.
2016-05-26 01:16:28 -05:00
Cheridan
b6cd3b0deb Ends Flyman Starvation 2016-05-26 00:59:21 -05:00
KorPhaeron
3ec4b2bf23 Cures zombies 2016-05-25 18:40:28 -05:00
phil235
fdc2228302 Fixes grab uses in Ratvar gamemode and changeling's hivemind link.
Also a typo.
2016-05-26 00:33:25 +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
phil235
4b4bbb28cc can't choke people with breathing tubes.
another tiny fix with tablepush.
2016-05-25 23:22:03 +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
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
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
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
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
AnturK
7041152a37 Merge pull request #17846 from Incoming5643/patch-7
Flips the bird
2016-05-24 17:47:15 +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