Leshana
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
mistyLuminescence
dfc0dd48bc
Removes vials
2018-03-30 02:12:58 +01:00
Anewbe
88463b5709
Normal brute kits disinfect wounds
2018-03-29 17:51:55 -05:00
Anewbe and GitHub
92df13c8c1
Merge pull request #5098 from Woodratt/03232018_randomaddsntweaks
...
Changes to objects random
2018-03-29 12:37:14 -05:00
Aronai Sieyes and Atermonera
7d3aec96fd
Arranges lots of things into planes ( #5072 )
...
* Rearranges a billion things into planes
* Make cryotubes fancy
* Update Travis
* Fix hiding logic
2018-03-28 12:59:12 -07:00
Atermonera and GitHub
6adbe5537e
Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear
...
Adds permanent markers
2018-03-28 11:49:10 -07:00
Arokha Sieyes
29eb468ef5
POLARIS: Fixes #5282 (VS) - Allow use of pens to label pill bottles, like glass bottles
2018-03-25 17:05:20 -04:00
Woodratt
fe28a50574
Changes to objects random
...
- Fixed the icon_state for 'structure/plushie/carp' and the random first aid kit spawner
- Added a random chance tool spawn for power tools (most of the time it should still just be regular tools)
- Adjusted the spawn rate of medkits, combat medkits should be more rare
- Cash split into its own loot item
- Plushies split into large and small plushies
- All the extra plushie spawns added to the random plushie spawn
- Eightball and conch shell added to toy spawns
- Added spawn points for the large plushies, cash, and the power tools
2018-03-23 23:03:15 -07:00
Neerti and GitHub
c75158b14d
Merge pull request #5095 from Mewchild/MC-Implant
...
Updates tracking implant description
2018-03-23 18:45:09 -04:00
Neerti and GitHub
318762f091
Merge pull request #5088 from VOREStation/port-vs-catchup
...
VOREStation Ports Catchup
2018-03-22 22:32:09 -04:00
Mewchild
4cbefc8cdf
Updates tracking implant description
2018-03-22 12:28:14 -05:00
Cameron653 and Atermonera
59844c5553
Xenoarch Multitool & Xenoarch Excavation Drill ( #5058 )
...
* Xenoarch Multitool & Xenoarch Excavation Drill
* Makes the tool work better
* Cuts down on lines & left comments
* change to m
2018-03-22 09:50:50 -07:00
Reddeyfish
ace0058b1f
Merge branch 'virgoMaster' into virgoPull
2018-03-21 21:22:51 -07:00
Arokha Sieyes and Leshana
cad8df658e
POLARIS: Communicator small refactor
2018-03-21 14:30:43 -04:00
Neerti and GitHub
70ac478aea
Merge pull request #5065 from VOREStation/vs-port-3204
...
[PORT] Revamp logging for consistency
2018-03-20 21:13:47 -04:00
Arokha Sieyes
3cc7138ca3
POLARIS: Fixes #5282 (VS) - Allow use of pens to label pill bottles, like glass bottles
2018-03-20 19:01:36 -04:00
Billy Bangles
d953a58413
travis pls
...
why must we argue so
2018-03-19 21:23:48 -04:00
Billy Bangles
05fd53ebcc
adds permanent markers
...
also tweaks paint recipe to use ink instead of crayons.
2018-03-19 20:20:31 -04:00
BillyBangles and Atermonera
85e377f017
Adds a cursed sword (and other haunted things) ( #4931 )
...
* adds cursed sword and 'haunted' object framework.
* fixes back.dmi conflicts
* adds cursed blade ghost pod
as well as fixing some ghost pod oddities
* fixes misc.dm conflicts
* adds cursed sword cave POI
* makes cursed sword use voice mob
as opposed to a brainmob
2018-03-19 11:49:33 -07:00
mistyLuminescence
8769f4605a
trims list
2018-03-18 03:20:36 +00:00
mistyLuminescence
70f7ef7d6f
Wallet expansion!
2018-03-17 21:10:23 +00:00
Anewbe and GitHub
d36e67d90d
Merge pull request #5064 from VOREStation/vs-port-3142
...
[PORT] Improved playsound and drop_location() from /tg
2018-03-17 15:01:07 -05:00
Heroman3003 and Aronai Sieyes
1aef94ae0e
Module change and reset animations for borgs ( #3210 )
...
* Added robot module reset and change animation
* changed some procs to more appropriate ones
* removed unnecesary sleep()
* readded intialize proc for_temp_visual
2018-03-16 20:35:08 -04:00
Aronai Sieyes and GitHub
961f2934c4
Merge pull request #3242 from VOREStation/aro-commfactor
...
Communicator + NIF Refactor
2018-03-16 20:34:21 -04:00
Atermonera and GitHub
4fa4173e29
Merge pull request #5049 from Anewbe/quickdraw_items
...
Ports quickdraw storage items from VIRGO
2018-03-16 11:37:58 -07:00
Arokha Sieyes
020c2a06f1
POLARIS: Communicator small refactor
2018-03-15 23:47:00 -04:00
Leshana
a0de41f24f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
...
# Conflicts:
# README.md
# code/__defines/mobs.dm
# code/__defines/subsystems.dm
# code/_helpers/global_lists.dm
# code/controllers/subsystems/garbage.dm
# code/controllers/subsystems/overlays.dm
# code/datums/datacore.dm
# code/datums/supplypacks/munitions.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/weapons/id cards/station_ids.dm
# code/game/objects/random/random.dm
# code/game/turfs/simulated/floor.dm
# code/game/turfs/simulated/floor_icon.dm
# code/modules/awaymissions/gateway.dm
# code/modules/client/preferences.dm
# code/modules/ext_scripts/python.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/mob/new_player/preferences_setup.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/robolimbs.dm
# code/modules/reagents/reagent_containers/glass.dm
# code/modules/reagents/reagent_containers/syringes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-4.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-03-15 22:41:14 -04:00
Anewbe
5212fa152b
Species names should now use defines
2018-03-15 20:24:45 -05:00
Arokha Sieyes and Leshana
6158cd1d26
POLARIS: Use drop_location() for things
2018-03-13 19:23:46 -04:00
Arokha Sieyes and Leshana
73838e0a62
POLARIS: Revamp logging to be consistent
2018-03-13 18:20:58 -04:00
Leshana and Anewbe
57ed0f6e9e
Sundry Runtime Fixes - March ( #5047 )
...
* Fixes Runtime in tools.dm,239: undefined variable /mob/living/simple_animal/retaliate/solargrub/var/handcuffed
* Add logging to help identify the cause of runtime in examining zshadow mobs.
* Fix Runtime in buckling.dm,165: Cannot execute null.forceMove().
* Fixes Runtime in robot_items.dm,31: Cannot read null.origin_tech
* Fixes Runtime in paper_bundle.dm,183: Cannot read null.loc
2018-03-13 00:13:19 -05:00
Reddeyfish
03f3d9b5c1
Merge branch 'virgoMaster' into virgoPull
2018-03-12 18:41:26 -07:00
Atermonera and GitHub
cb37f7d36c
Ater missed another <br>
2018-03-11 19:26:08 -07:00
Anewbe and GitHub
9f56416684
Merge pull request #5037 from VOREStation/aro-updateicons
...
Rewrite human/update_icons()
2018-03-11 21:03:10 -05:00
Anewbe
a8cc2df4ad
Ports quickdraw storage items from VIRGO
2018-03-11 16:56:17 -05:00
Cerebulon and Anewbe
b7090d7df2
Adds Tajaran Akhani language. ( #5032 )
...
* Adds Tajaran Akhani language.
Fixes plural form of Tajaran (Tajara->Tajaran) in about 50 places.
* Gives the language a colour distinct from Siik.
* Changelog
2018-03-11 16:55:08 -05:00
Mewchild
e129f03b42
Gives RD explorer comms
2018-03-10 16:52:52 -06:00
Arokha Sieyes
2c9bdf3ae4
POLARIS: Revamp logging to be consistent
2018-03-10 17:18:09 -05:00
Anewbe and GitHub
f2da429eab
Merge pull request #4980 from MisterLayne/ED_CLN
...
Adds the ED-CLN
2018-03-10 15:04:07 -06:00
Layne and Anewbe
acdde85f4d
Reinforced snowball fix. ( #4991 )
...
* temp snowball fix
* Create MisterLayne - SnowballTEMPFIX
* Update and rename MisterLayne - SnowballTEMPFIX to MisterLayne - SnowballTEMPFIX.yml
2018-03-10 14:58:25 -06:00
Aronai Sieyes and GitHub
54cf9636ec
Merge pull request #3189 from Verkister/moreborgostuff
...
Readies our borg stuff for next sync fixes.
2018-03-10 15:01:04 -05:00
Arokha Sieyes
306a484b48
U_I Phase 2.4: Storage cleanup
2018-03-08 19:34:00 -05:00
Arokha Sieyes
53a185f838
U_I Phase 2.0: Code cleanup
...
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
2018-03-08 19:33:44 -05:00
Arokha Sieyes
62e0c122fa
U_I Phase 1.4: More preview fixes, not done yet
2018-03-08 19:31:56 -05:00
Arokha Sieyes
3be602dece
U_I Phase 1.3: Previews are broken, so that's a thing
2018-03-08 19:31:55 -05:00
Arokha Sieyes
2f433c9ea9
U_I Phase 1.2: Something is broken somewhere
2018-03-08 19:31:54 -05:00
Arokha Sieyes
94c2110f27
U_I Phase 1.1: Fix phase 1 bugs
...
Softsuits making your clothes disappear, PDAs in ID slot making you double
2018-03-08 19:31:54 -05:00
Arokha Sieyes
aa9ec19118
U_I Phase 1.0: First consolidation pass
2018-03-08 19:31:43 -05:00
Arokha Sieyes
4538a6859f
POLARIS: Use drop_location() for things
2018-03-08 13:03:09 -05:00
Verkister
8cffc2298c
Readies our borg stuff for next sync fixes.
...
-Fixes the default module icon missing from our _vr.dmi
-Makes our custom modules enable ui_style_vr to pull the hud icon from our dmi instead.
-Makes relogging etc not revert to default ui file if ui_style_vr is enabled for the borg.
-Moves the clumsy VS edit borg reset stuff to a more appropriate place.
-Adds the recently fixed attack anim offset fix and the ui_style_vr to the reset module.
2018-03-07 11:29:46 +02:00
Leshana