Kelshark
c048a8ea8b
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# code/modules/vore/weight/fitness_machines_vr.dm
# config/custom_items.txt
2018-02-02 19:25:51 -05:00
RadiantFlash7
22d13f10c2
All my changes so far.
...
note to self: Engineering, Perma, civil jobs, and electricity+piping
2018-02-02 04:57:01 -05:00
Aronai Sieyes
88cab44124
Merge pull request #2848 from VOREStation/aro-exploration
...
Exploration Update
2018-01-27 15:32:42 -05:00
Arokha Sieyes
19b2d5a338
VS: Polaris already has this, I need it now though
2018-01-27 14:10:51 -05:00
Arokha Sieyes
1910940c43
VS: Remove some bad VS edits
2018-01-27 14:10:50 -05:00
Arokha Sieyes
8a147d5a3a
POLARIS: Move these defines elsewhere
2018-01-26 17:17:40 -05:00
Arokha Sieyes
716a932f26
POLARIS: Allow pulling objects through step teleports.
2018-01-25 16:44:30 -05:00
Arokha Sieyes
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Neerti
5b54f4c875
Surface Map Work ( #4557 )
...
* Tweaks Surface, POI system
* More Stuff
* Travis Appeasement
* Fixes invisible banner.
2018-01-17 13:46:19 -06:00
Neerti
d0d6689263
Web Shuttle Update
...
Adds autopilot functionality for shuttle one and shuttle two. It can be enabled and disabled by the flight computer.
Autopilot is active by default on both shuttles. The shuttle waits for two minutes when it reaches the outpost or station, except for the first flight, where it waits for about ten minutes, which should be plenty of time for people to get on and for the pilot to turn it off if one exists.
Adds renaming feature to all shuttles.
Ports /tg/'s 'shuttle warning' effect, which adds a bunch of blue circles where a ship is about to land, which should prevent surprise shuttle crushes if paying attention.
Flight times for all routes are cut in half to act as the bonus for flying manually. Automatic flight takes twice as long, and so it will take the current amount of time.
Makes Ninja shuttle faster because Nippen steal.
Does some cleanup with temporary effects.
2018-01-14 14:03:58 -05:00
Leshana
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
Neerti
bde9ae6f7e
Adds Visual Cleavage
...
Axes executing a cleaving attack now has a visual effect to show the tiles that can potentially get hit.
Gives hatchets and the energy axe the ability to cleave.
2017-12-31 05:53:39 -05:00
Arokha Sieyes
d998f36c38
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018
...
# Conflicts:
# code/game/objects/structures/signs.dm
# code/modules/mob/living/carbon/human/human.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/organs/organ_icon.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2017-12-26 23:07:58 -05:00
BothNevarBackwards
4540f770d4
Lots of species stuff ported from Baystation ( #4442 )
...
* Ports species based footprints from bay
- https://github.com/Baystation12/Baystation12/pull/17935
- https://i.imgur.com/ojAU373.png
- Unathi use claw on right
- Taj and tesh use paw in center
* Flash stuff glasses protection things
* Flash stuff actual thing
* Organ mult thingy
* Floaty eyes and cloak setup
* Species falling
2017-12-26 14:28:21 -05:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Anewbe
e51f3aad61
Fixes sprites, moves planetary explosion to fall_impact
2017-12-02 16:36:50 -06:00
Anewbe
c2a8afb7c0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute
...
# Conflicts:
# icons/mob/back.dmi
# icons/obj/storage.dmi
2017-12-01 18:47:06 -06:00
Anewbe
085c33e39a
Adds parachutes
2017-12-01 18:37:30 -06:00
Neerti
af5c633cdb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob
...
# Conflicts:
# code/game/atoms_movable.dm
2017-11-29 22:43:05 -05:00
Neerti
acb208dd3f
Works on New Blob
2017-11-29 22:35:01 -05:00
Neerti
2f7db506eb
Adds Variable Click Delay
...
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
2017-11-28 16:11:56 -05:00
Mechoid
d5404ae0eb
Adds More Spiders. Touches cuff-code tangentially.
2017-11-21 12:59:06 -08:00
killer653
11c195debb
Polaris Sync
2017-11-04 13:37:13 -04:00
Anewbe
fce9fe2c72
Merge pull request #4188 from Atermonera/VR_2
...
Virtual Reality
2017-11-03 15:10:53 -05:00
Atermonera
64942bd04c
VR Core
2017-10-30 22:32:36 -07:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Mechoid
920e823a46
Fuel-Rod Gun, Minor fixes related. ( #4103 )
...
* A whole load of things.
* Fixes the SM Rod's travel distance.
2017-10-19 15:07:52 -05:00
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
Mechoid
9a04744ab6
Turrets detect targets through metal foam.
2017-10-15 13:48:38 -07:00
Mechoid
56ec5ec94c
Adds three flame-themed illegal Mech weapons and more. ( #4058 )
...
* Adds three flame-themed illegal Mech weapons. Allows anything using apply_effects to be incendiary and ignite/apply firestacks. Also absolute-paths the spilled fuel effects.
* Removes world << because I'm a good coder honest.
* Why does Git do this for no reason.
2017-10-13 23:32:52 -05:00
Spades
4bc0708f01
Merge pull request #2282 from Cyantime/grublarvs
...
Improves solargrub larva
2017-10-12 18:12:31 -04:00
Cyantime
612db9b2c0
wooorms
2017-10-11 13:29:31 -04:00
Neerti
1f0bb5891c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles
...
# Conflicts resolved:
# code/modules/busy_space/organizations.dm
2017-10-10 01:19:53 -04:00
Neerti
7225ea2b66
Read github PR for details.
2017-10-10 00:48:27 -04:00
Cameron Lennox
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
Anewbe
098bb66e4a
Makes landmarks invisible, mobcorpse landmark actually despawns
2017-10-05 21:44:26 -05:00
Anewbe
b3fdf3836e
Adds a frost spider nest PoI, adds frost spider things
2017-09-29 22:01:41 -05:00
killer653
2755d3ddb1
HOTFIX
2017-09-21 20:26:48 -04:00
Anewbe
d79a983eba
Adds the Frost Spider. Starts support for more complicated spiderlings.
2017-09-17 23:43:31 -05:00
killer653
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
Ketrai
3da219cf8e
grublarba
2017-09-09 22:38:54 +02:00
Ketrai
d595871114
derp
2017-09-09 22:38:15 +02:00
Ketrai
a8d8f35ae6
grubs make larva
2017-09-09 22:25:33 +02:00
Spades
6eb472f31d
Revert "Adds a new event - Solargrubs!"
2017-09-09 12:24:37 -04:00
Neerti
1bc28c07c0
Port's TG's Maploader
2017-09-08 12:49:26 -04:00
Ketrai
0c8a2796ff
adds spider_vr.dm
...
tiny bit of code to do everything they have to do.
2017-09-06 10:45:43 +02:00
Ketrai
c62245353b
delete grub_vr.dm
...
making spider_vr.dm instead
2017-09-06 10:44:53 +02:00
Ketrai
d32c6f07a9
undoes the edit
...
Cutting down the code confuses the hell out of the event, it refuses to spawn the grub larva otherwise.
2017-09-05 21:56:28 +02:00
Ketrai
ad3cabfca8
cuts down inherited code
...
This should cut down code that was inherited from effects/spider
2017-09-05 21:16:45 +02:00
Ketrai
31959bef22
travis random crash
...
UGH
2017-09-05 18:17:30 +02:00
