Commit Graph

2088 Commits

Author SHA1 Message Date
VistaPOWA fe410178fb Gives Razharas' icon to the syndieborg
Adds the crowbar and flash module to the syndieborg loadout
Changes the TC_cost variable of the teleporter to update with the
uplink_items TC_cost (thanks for the help Giacom).
2014-01-06 18:32:38 +01:00
VistaPOWA 60deb3c010 reverts another merging failure 2014-01-05 14:13:46 +01:00
VistaPOWA 68afbbcc18 move along people, nothing to see here 2014-01-05 03:35:17 +01:00
VistaPOWA fd34cea8ef fixes the merging failure
hopefully that's it
2014-01-05 03:32:10 +01:00
VistaPOWA 443d6e2d9e [MAP] Adds Syndicate Borgs
Nuclear Operatives can now order a Syndicate Borg for 20TC. After
spawned, a candidate from ghosts is chosen to control it.
It has a 25k cell and the following modules:
-Emag
-Esword
-Ebow
-Laser Rifle
-Jetpack

All weapons use 100 charge per shot.

2 borg rechargers have been added to the Syndicate Shuttle for the
Syndieborgs to use.
Changelog will be added in a separate commit.
2014-01-05 03:13:40 +01:00
Cheridan 3a11af405c Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192
Conflicts:
	code/modules/clothing/head/misc.dm
2014-01-02 10:00:58 -06:00
Cheridan 8006b75307 Merge pull request #2182 from Rockdtben/sayRefactor
Refactored how say deals with masks. As well as derp speech.
2014-01-01 14:46:04 -08:00
Cheridan 87e69e0515 Merge pull request #2206 from fleure/stabbystab
Fixed stabbing head with thick suit on
2014-01-01 14:28:29 -08:00
Giacom 4832398f88 Merge pull request #2181 from errorage/2013_12_29_dmg_overlay_thresholds
Changes damage overlay threshold from 10+ to 35+
2014-01-01 07:50:35 -08:00
fleure 4a01ed176c Fixed stabbing error message target check 2014-01-01 15:33:49 +00:00
fleure 61f2cf9292 Fixed stabbing head with thick suit on 2013-12-31 23:39:30 +00:00
Cheridan bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Aranclanos d5ddac3a00 Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
Cyber limbs fixes [FIXES #1920] + [Fixes #2180] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
Aranclanos a5571508d0 Merge pull request #2049 from Incoming5643/wands3
Magic Mania: Sprites, Fixes, Balancing, and Mini-Features
2013-12-29 11:47:59 -08:00
Incoming 47ba33c50c Removes a pair of well meaning but apparently poorly realized code fixes for edge cases. 2013-12-29 13:46:29 -05:00
Rockdtben 89faaaf999 Moved Speech Modification via masks to masks. say and whisper now call the speechModification(message) proc in wear_mask.
Moved derpspeech modification to mob_helpers.dm
2013-12-29 12:12:41 -06:00
Robson Richards d3d4c79946 Merges Heal_Damage and Heal_robotic_damage procs
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
errorage 5153fa4cef Changes damage overlay threshold from 10 and on to 35 and on
- Changes the damage overlay thresholds so they start displaying when you are a bit more damaged than currently. There are six damage overlays, their thresholds used to be 10-25; 25-40; 40-55; 55-70; 70-85; 85-infinity. This change sets them to 35-45; 45-55; 55-65; 65-75; 75-85; 85-infinity. (The thresholds are the sum of fireloss, bruteloss and the hit indicator variable)
- Oxyloss overlay left unchanged, since you pass out at 50 or something, so you need the visual cue quicker.

Main reason for this proposed change is that I feel the overlays kick in too quickly. I think it'd be good to leave a little room, so you don't get an overlay as soon as the first moron boops you over the head with his crowbar.
2013-12-29 18:13:32 +01:00
Giacom 46a6830dec Merge pull request #2148 from ACCount12/master
Space Retrovirus fix
2013-12-29 02:57:39 -08:00
Incoming 392c6d51a9 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3 2013-12-27 02:33:47 -05:00
Cheridan 7c2fbba76f Merge pull request #2111 from Perakp/voiceChangerFix
Voicechanger fix
2013-12-26 22:06:38 -08:00
Incoming 26a1bb65f2 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
Conflicts:
	code/modules/mob/death.dm
	code/modules/mob/living/carbon/alien/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/silicon/death.dm
	code/modules/mob/living/silicon/robot/death.dm
2013-12-27 00:55:44 -05:00
ACCount 15ef414627 Viral fix
Fixed strain_data, removed some unused code.
2013-12-27 17:43:26 +12:00
Cheridan f36a7d764c Merge pull request #2110 from Perakp/mimeSpells
Changes mime abilities into spells
2013-12-26 20:56:40 -08:00
Cheridan 4f144e0111 Merge pull request #2130 from Giacom/gib_refactor
Refactored gib() and dust()
2013-12-26 20:34:50 -08:00
Giacomand 173e1cb391 * Refactored gib() and dust()
* Refactored ex_act(), for mobs, a little.
* Removed the code which gibbed dead bodies with any severity.
2013-12-23 17:56:58 +00:00
Giacom 38e0ae8848 Merge pull request #2019 from Jordie0608/Dogmas
Added reindeer hats
2013-12-23 04:18:42 -08:00
Aranclanos 40929b37d3 Merge pull request #2093 from Giacom/small_fixes_and_tweaks
Small Tweaks and Fixes
2013-12-21 15:12:01 -08:00
Aranclanos e7579e2aa8 Merge pull request #1986 from Perakp/janitorCartFix
Fixes janiborg interaction with janicarts
2013-12-21 15:01:37 -08:00
Giacom 9d24a900ae Merge pull request #2066 from Perakp/slipFix4
No slipping when lying down
2013-12-21 13:54:39 -08:00
Giacom bcfcb3a9cf Merge pull request #2073 from Jordie0608/ShakeTheRoom
Gibbing borgs explode violently
2013-12-21 13:42:59 -08:00
Perakp b1996a77e1 Fixes AI seeing the name of the person who speaks over radio using a voice changer. 2013-12-21 23:01:52 +02:00
Perakp 0d1ba1eccf Changes mime abilities into spells. Admins can now give these from the 'give spell' menu. Unlike previous mime abilities, these are not transferred when a mime is cloned. 2013-12-21 20:54:07 +02:00
Perakp 65e0931d55 Merge branch 'master' into janitorCartFix
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
2013-12-21 09:40:06 +02:00
Incoming 2b827e3592 Bugfix: Slimes that reproduce will now properly inherit magic spells 2013-12-21 02:08:21 -05:00
Cheridan 046714d864 Merge pull request #2092 from Giacom/grab_monkey
Monkeys no longer wander off when being pulled or grabbed.
2013-12-20 11:44:25 -08:00
Incoming a73721f7a1 Fixes for Gia:
Fixes the mysteries of reviving simple animals in the least intrusive manner I could think of
Removes player_controlled because ckeys did much the same thing
Uses update_canmove() instead of hardseting it

One last Bugfix: Simple animals generated with no real_name will use their initial name as their real name so that transformed antags will not get a "(survived as )" because the thing they turned into didn't have a real_name set.
2013-12-19 21:49:15 -05:00
Giacomand 80f2076bcc * Fixed the party alarm from only working in areas with a certain light level.
* Reduced a lot of duplicated code in the party alarm.

* Added a shield range variable for the anti-breach shield generators.
* Changed the shield range to 4, making them more useful.
* Fixed a bug with the deployed_shields list not being cleared after the shields are down.

* Fixed a runtime with shake_camera()
2013-12-19 22:07:52 +00:00
Giacomand c917999f2f * Monkeys no longer wonder off when being pulled or grabbed.
* Fixed the grabbed_by list not being emptied when the grab is deleted.
 * Removed duplicated use of grabbed_by.
 * Undef'd defines which are only used in a single file.
2013-12-19 20:41:19 +00:00
Incoming 689aecc336 I forgot how children work guys
Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
2013-12-19 15:07:59 -05:00
Cheridan 8ba3859b2d Merge pull request #2069 from Aranclanos/pAIBioscan
pAI bioscan runtime fix
2013-12-19 10:41:07 -08:00
Incoming ac1a96fd43 feature: renames the monkeyizing var to "notransform" since that's how it was being used in the code, as a flag to tell code to ignore transformation (initially because they were already turning into a monkey).
bugfix: gives notransform to etheral jaunting based on an observed edge case where a wizard was staff of changed while starting a jaunt and got stuck in bluespace for the rest of the round

meta: modified revive() so I could remove all that horrible snowflake I introduced to let reviving simple mobs come back
2013-12-19 11:50:33 -05:00
Jordie0608 33a315a111 Switched position with gib 2013-12-19 12:48:14 +11:00
Perakp 2f70aaadb3 Removes magic numbers and an useless check
- it shouldn’t runtime.
2013-12-18 22:31:07 +02:00
Perakp 68ff764463 Subtypes of janiborg tools
- The other way of fixing it. I’m not sure why this is better.
- Removed condescending messages to cyborgs.
2013-12-18 20:44:24 +02:00
Jordie0608 8da1ab8641 Gibbing borgs explode violently. 2013-12-19 05:31:15 +11:00
Giacomand 44895bf36f Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff
Resolved Conflicts:
	code/modules/projectiles/projectile.dm
2013-12-18 18:27:22 +00:00
Incoming 45e89b5190 Bugfix: Adds a var to simple animals "player_controlled" to surpress behaviors in simple_animals that have players assigned.
Bugfix: Dead player mice won't be converted to items so they can still be revived.
Bugfix: Players playing chicks won't die by developing into chickens anymore
Bugfix: Fixes an edge case where a poor soul struck by multiple polymorphing shots at once ends up in a state where they can't move.

Feature: Renames the wand of resurrection to the wand of healing to drive home the fact that it does the same things the staff of healing can do

Balancing: Gives the wand of healing more shots. 10, 5, 5, 4 up from 3, 2, 2, 1
2013-12-18 12:28:38 -05:00
Aranclanos 0a18229abd pAIs won't runtime anymore if they try running a bioscan while lying on the floor 2013-12-18 13:12:59 -03:00
Perakp b4c8f4ccf3 I spend four hours merging my commits and I find this
- if it was any other programming language it wouldn’t have even
compiled.
2013-12-18 15:10:28 +02:00