Arokha Sieyes
055c998f82
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/modules/integrated_electronics/subtypes/reagents.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/organs/organ_external.dm
# code/modules/ventcrawl/ventcrawl.dm
# html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
Neerti
d6683be3ce
Adjusts Changelings
...
See PR
2017-04-23 13:22:32 -04:00
Neerti
80a3865acf
Radios now work again in-hand or in pocket
2017-04-20 23:39:07 -04:00
Neerti
ea6128f986
Adds Modifier System, Changes Some Ling Stuff
...
Adds a fairly simple system that allows adjusting various numbers like max health, incoming damage, outgoing melee damage, etc. The nice part is that changing certain variables this way (like max health) is a lot safer than manually setting the max health var directly.
Changes a lot of short lines of code to point towards a variable's getter or setter helper instead of reading the var directly so the modifiers can work.
Endoarmor, delayed toxin sting, Enfeebling sting, and recursive adrenaline overdose now use the modifier system.
Enfeebling sting now only lasts two minutes, from five minutes, however it now also reduces the victim's melee damage by 25%/50%, and increases the damage they suffer by 10%/35%, for normal and recursive respectively.
Delayed Toxin Sting's effects are now felt all at once instead of over the course of a few minutes.
2017-04-18 21:23:59 -04:00
Leshana
5dac8b91b6
Merge branch 'master' of ../Polaris into polaris-sync
2017-04-18 19:35:59 -04:00
Anewbe and GitHub
55d895aa14
Merge pull request #3327 from Atermonera/Translator_Languages
...
Fixes a runtime with borgs and translators
2017-04-17 23:25:01 -05:00
Atermonera
e5e5c446a6
Fixes a runtime with borgs and translators
2017-04-17 21:01:42 -07:00
Leshana
7a4dc4bf79
Merge remote-tracking branch 'polaris/master' into polaris-sync
...
# Conflicts:
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/zresearchlabs.dmm
2017-04-15 23:14:32 -05:00
LorenLuke
26c3653aec
Changes most '<<' to 'to_chat()'
2017-04-13 12:46:04 -07:00
LorenLuke
031e63dd7b
Can remove ID via Alt-Clicking now.
2017-04-11 00:06:40 -07:00
Arokha Sieyes
e01278a72f
Communicator fixes
2017-04-06 18:08:13 -04:00
Arokha Sieyes
c57e6e75b7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync
...
# Conflicts:
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
Line ending changes?
2017-04-02 23:25:59 -04:00
Atermonera
d9c68e5b9b
Translators still check against hiveminds
2017-04-01 17:49:34 -07:00
Atermonera
971cd2da30
Translators don't understand animals and other languages that recorders can't record.
2017-04-01 16:48:01 -07:00
Leshana
6eee55c983
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
...
# Conflicts:
# code/modules/client/preference_setup/general/03_body.dm
# code/modules/mob/new_player/sprite_accessories.dm
# html/changelogs/.all_changelog.yml
# icons/mob/human_races/markings.dmi
# vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe and GitHub
81aec38408
Fixes a text thing
2017-03-31 19:40:40 -05:00
Anewbe
ca47d37d2f
Adds a few more cosmetic flashlights
2017-03-31 18:50:00 -05:00
MagmaRam and GitHub
34e398d328
Merge pull request #3175 from Anewbe/hands_things
...
Device Cell QOL
2017-03-30 20:49:24 -05:00
MagmaRam and GitHub
19a9a8a413
Merge pull request #3172 from Anewbe/jumper_cables
...
Adds in Jumper Cables for FBP reviving
2017-03-30 19:46:26 -05:00
Anewbe
c9bfabd426
Device Cell QOL
2017-03-29 13:58:35 -05:00
Anewbe
6328f1262f
Adds in Jumper Cables for FBP reviving
2017-03-29 12:43:38 -05:00
Cerebulon
1d09caa08d
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into engineering_sprites
2017-03-29 06:24:06 +01:00
Cerebulon
55fd0a2041
Adds hand sprites to many items in the engineering department
2017-03-29 04:09:33 +01:00
Anewbe
cddbc6e976
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radio_freqs
2017-03-28 14:28:15 -05:00
Arokha Sieyes
9edf3a6629
Polaris Merge Sync
2017-03-26 20:12:34 -04:00
Cerebulon
6472f02040
Removed unnecessary icon_state code. Added basic scanner sprite.
2017-03-26 22:00:09 +01:00
Cerebulon
3c17d1b33f
Added in-hand sprites to most item lacking them from the Medical department.
...
(Full list: Body bag, Advanced Mass Spectrometer, Rescue Suit Control Module, Stethoscope, Stasis bag, Defibrillator, Blood Packs, Advanced Trauma/Burn Kits, Hypospray, Biopsy Scanner, Surgical Drill, Fixovein, Retractor, Bone-Gel, Bone Setter, Cautery, Hemostat, Inflatable Wall Box.
2017-03-26 07:04:01 +01:00
Anewbe
88b0c6086e
Antag Radio changes
2017-03-25 14:19:57 -05:00
Cerebulon
38571fb8bc
Adds in-hand sprites to several items.
...
Hand labeller, light replacer, megaphone, binoculars, powersink, suit cooler and lantern.
2017-03-23 22:03:17 +00:00
MagmaRam and GitHub
e3a87c1c78
Merge pull request #2985 from Anewbe/more_pdas
...
Adds rugged style PDAs
2017-03-22 19:42:19 -05:00
Arokha Sieyes
be9bcf81f0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2017-03-21 11:22:29 -04:00
Anewbe
c65588b099
Communicator QoL
2017-03-21 00:51:26 -05:00
Arokha Sieyes
805b473976
Polaris Sync Merge
...
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Anewbe
bf307ac0dc
Translators can't output hive or nonverbal languages
2017-03-15 20:56:18 -05:00
Neerti and GitHub
d4b6fc9f32
Merge pull request #3052 from Anewbe/emp_things
...
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Anewbe
ab1812d9ff
Adds the ear translator
2017-03-13 20:03:45 -05:00
Arokha Sieyes
4c0e330140
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync
2017-03-11 18:47:17 -05:00
Anewbe
f4dd443b01
Ports the translator
2017-03-10 21:46:57 -06:00
Anewbe and GitHub
7130d56b80
Merge pull request #3064 from Woodratt/WR_SC_Changes
...
WR_SC_Map_Changes
2017-03-08 19:58:46 -06:00
woodratt
19fb047f01
WR_SC_Map_Changes
...
- Fixes sprite issues with departmental intercoms.
- Tweaks to the random objects dm
- Copies Bay's flora and warning sign list, as well as ports some of their signs.
- Addition of a couple new floor decals.
- New table preset, wooden reinforced.
2017-03-08 17:44:48 -08:00
Leshana
f53dfde515
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
...
# Conflicts:
# code/game/objects/items/blueprints.dm
# vorestation.dme
2017-03-06 20:58:38 -05:00
Anewbe
b4ec8eb026
Oxyloss shows as cyan
2017-03-05 14:19:51 -06:00
Anewbe
19710d9bd8
Reworks empulse and emp_act
2017-03-05 12:22:45 -06:00
Yoshax
3162c723d9
Security non-lethal balance
2017-02-13 15:49:35 +00:00
Anewbe
79390b6177
Adds rugged style PDAs
2017-02-04 22:42:06 -06:00
killer653
832418c7c9
Polaris sync
2017-01-15 18:12:15 -05:00
MagmaRam and GitHub
e6ac388471
Merge pull request #2891 from Anewbe/cyber_scan
...
Robolimbs no longer show up on medical's handheld scanners
2017-01-14 14:39:18 -06:00
Neerti
f393dafa5d
Ports Bay's Journalist TV Drone
...
Also ports prerequisite entertainment radio frequency code.
2017-01-09 05:03:40 -05:00
Anewbe and GitHub
8ae0c62d60
Merge pull request #2903 from Neerti/1/4/2017_flash_tweak
...
Make Flashes Great Again
2017-01-05 18:34:29 -05:00
Neerti
42807003f5
Makes halloss amount scale based on flash_strength
2017-01-05 02:30:52 -05:00
Arokha Sieyes