6756c5a483
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
...
# Conflicts:
# .travis.yml
# code/ATMOSPHERICS/components/unary/outlet_injector.dm
# code/__defines/_planes+layers.dm
# code/__defines/chemistry.dm
# code/__defines/mobs.dm
# code/_helpers/mobs.dm
# code/_onclick/hud/robot.dm
# code/game/area/areas.dm
# code/game/machinery/computer/supply.dm
# code/game/machinery/cryopod.dm
# code/game/machinery/doors/airlock.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/devices/communicator/messaging.dm
# code/game/sound.dm
# code/game/supplyshuttle.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/events/event_container.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/language/language.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_powers.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species_shapeshift.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_powers.dm
# code/modules/mob/living/say.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/logout.dm
# code/modules/mob/mob_helpers.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_icon.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_containers/syringes.dm
# code/modules/shuttles/shuttle.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/wildwest.dm
# maps/southern_cross/items/clothing/sc_head.dm
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-03-31 09:20:59 -04:00
c75158b14d
Merge pull request #5095 from Mewchild/MC-Implant
...
Updates tracking implant description
2018-03-23 18:45:09 -04:00
4cbefc8cdf
Updates tracking implant description
2018-03-22 12:28:14 -05:00
73838e0a62
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
68a5fabe11
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/devices/translator.dm
# code/game/objects/items/weapons/dna_injector.dm
# code/modules/client/preference_setup/loadout/loadout_ears.dm
# code/modules/mob/living/simple_animal/aliens/hivebot.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
59e07f941e
Implant Tech
2018-02-26 09:23:18 -05:00
0c0f09fe68
POLARIS: Fix several Destroy()s
2018-02-20 10:00:23 -05:00
a75cfe0eb1
POLARIS: Fix several Destroy()s
2018-02-20 00:20:46 -05:00
28c193cbdb
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
...
# Conflicts:
# code/game/objects/items/devices/communicator/communicator.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/mob_helpers.dm
# code/unit_tests/zas_tests.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-04 22:44:04 -05:00
064f2fe9ca
Additional types which need Destroy to return qdel hints (and other Destroy fixes)
2017-12-30 16:02:27 -05:00
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
ad0ad62cde
The game actually clicks when it claims to. ( #4403 )
...
* Update paiwire.dm
* Update life.dm
* Update traps.dm
* Update safe.dm
* Update alarm.dm
* Update safe.dm
* Update implant.dm
* Update life.dm
* Update traps.dm
* Update life.dm
* Update safe.dm
* Audible message test
2017-12-07 18:18:01 -06:00
d5f582013f
Reagent generator implants now support multiple reagents at once.
2017-11-04 01:04:37 -04:00
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
e61efc752a
more gammers ( #4052 )
...
* Update medsci.dm
* Update miscellaneous.dm
* Update arcade.dm
* Update transform.dm
* Update implanter.dm
* Update shuttle_console.dm
2017-10-13 23:32:22 -05:00
e650c62c6b
LOTS OF FIXES
2017-10-08 18:05:27 -04:00
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
66837464d2
Implanters should have an icon again
2017-10-04 23:07:59 -05:00
5e635aff46
Adds a hacky method to put loadout implants in the user's antag records. Fixes a runtime.
2017-10-02 00:11:27 -05:00
46e411f80f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into tracking_implant
2017-10-01 21:52:36 -05:00
969aa45e9a
Switches 2 for DEAD
2017-09-29 12:07:16 -05:00
7c5d7c4d75
Improves tracking implant code, adds a tracking implant variant to the loadout
2017-09-28 20:25:46 -05:00
73ddd22296
Implanter tweaks
2017-09-27 11:59:59 -05:00
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
4bfcec55f2
work
2017-09-04 21:52:47 -04:00
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
36b0f5fa99
Even More Circuit Changes
...
See PR for changes.
2017-08-01 16:13:27 -04:00
c91dc333cd
Some more types which need Destroy to return qdel hints!
2017-06-14 01:13:54 -04:00
48edfb2fdc
Some more types which need Destroy to return qdel hints!
2017-06-14 00:59:32 -04:00
f154683662
Removes the snowflake human defined verbs from the majority of the reagent implants
2017-06-08 21:52:56 +01:00
197a648795
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
9d8f4cfa53
Fixes Death Alarms
2017-05-31 19:38:07 -05:00
3d63880041
Adds defines cause who wants problems
2017-05-20 18:11:20 +01:00
40be042005
Add's Tempest's custom implant item ( #1461 )
...
* Implant stuff
Does more implant stuff
Does even more implant stuff
EVEN MOAR IMPLANT STUFF
Adds Tempest's custom fluff implant along with the generalized parent type
* Changes implant to just use its own reagents holder rather than a beaker, thanks Leshana
* Last commit maybe? Yay?
2017-05-03 22:09:07 -04:00
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
2c25fcec02
Fixes Circuit Bugs & QoL chances
2017-04-23 09:51:53 -04:00
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
2c9c3e208e
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
...
# Conflicts:
# code/modules/mob/living/simple_animal/hostile/giant_spider.dm
# code/modules/organs/blood.dm
# code/modules/organs/internal/lungs.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
805b473976
Polaris Sync Merge
...
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
c7857a5bf3
Improves AR glasses, makes them available
...
Now you can start with them in loadout. They are no longer SUNglasses though, so they won't protect you from flashes.
There are several models, the loadout ones are the civilian ones.
- Civilian: Displays job ID icon based on the person's ID, and shows a health bar only if they are injured.
- Medical: Same as civlian, but displays advanced status (virus, borer, etc) along with backup implant status, and allows medical records access.
- Security: Same as civilian, but displays warrant and arrest status, and will automatically darken (electrochromic) in response to flashes, making the wearer immune, plus security records access.
- Engineering: Same as civilian, but will automatically darken to protect one's eyes during welding.
- Research: Same as civilian, but has a trendy goggle form factor for SCIENCE reasons.
- Omni: Has the combined features of all of the above. The only pair available spawns in the CD's office. (CC officers also)
2017-03-05 20:58:59 -05:00
19710d9bd8
Reworks empulse and emp_act
2017-03-05 12:22:45 -06:00
387f429e5e
Merge large polaris changes
2017-03-02 22:44:17 -05:00
bb2adf1290
Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system
...
Ports a large chunk of the map datum system that europa/bay uses.
2017-03-02 16:32:02 -06:00
50a8b94294
Make implanters able to be created
...
Under 'medical' in the autolathe. 1 sheet metal, 1 sheet glass (syringes were 2 sheets total so just keeping with that).
2017-02-28 16:25:55 -05:00
12abb2d6f2
Ports a large chunk of the map datum system that europa/bay uses.
...
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
3f1e5c80f2
Polaris sync
2017-02-01 15:08:45 -05:00
83db0cc38f
Medical tweaks
2017-01-23 23:43:44 -06:00
9b61d10a0a
Merge pull request #837 from Cameron653/master
...
January Polaris Sync and various fixes
2017-01-19 00:39:08 -05:00
e63176c2e6
Tweaks some emotes
2017-01-16 18:48:00 -06:00
Leshana