cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 03:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,770 Commits 8 Branches 26 Tags
3b89c5e32043f1c5ca308e70ecc5c19e3eacd5fc
Commit Graph

4035 Commits

Author SHA1 Message Date
Anewbe
ebdf9b191b Merge pull request #4425 from MisterLayne/energy_spear_fixed 
Energy Spear
 2017-12-11 00:47:05 -06:00
MisterLayne
0e5a097534 Second time is the charm. 2017-12-09 09:38:03 -05:00
Neerti
791754b2de Merge pull request #4382 from Anewbe/parachute 
Adds parachutes
 2017-12-08 20:17:51 -05:00
Belsima
8d3ceab287 grammar never ends (#4421) 
* Update Sleeper.dm

* Update robot_fabricator.dm

* Update requests_console.dm

* Update vr_console.dm

* Update teleporter.dm

* Update records_scanner.dm

* Update mercrenegade.dm

* Update clown_items.dm

* Update firstaid.dm

* Update teleporter.dm

* capitalization fixes

* Update clown_items.dm
 2017-12-08 15:30:34 -06:00
Mechoid
1175713235 Merge pull request #4408 from Anewbe/adv_kit_tweaks 
Reduces adv medical item healing from 5 to 3
 2017-12-07 16:22:13 -08:00
Belsima
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
Anewbe
573d3a1bbd Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute 
# Conflicts:
#	icons/obj/storage.dmi
 2017-12-07 17:59:13 -06:00
Layne
4d842c6590 Adds snowballs. (#4414) 2017-12-07 17:51:36 -06:00
Belsima
b819963102 Flashes now click when they say they click. (#4393) 
* Flashes now click when they say they click.

* Better sound effect.
 2017-12-07 17:50:12 -06:00
mistyLuminescence
4b102b7870 Adds food bags! (#4389) 2017-12-07 17:49:59 -06:00
Anewbe
d0c580e0cb Reduces adv medical item healing from 5 to 3 2017-12-04 18:35:01 -06:00
mistyLuminescence
0d458b204e Adds the advanced health analyzer (#4326) 
* WIP - advanced health analyzer

* Adds the advanced health analyzer.

* Updates radiation levels

* Fixes travis and removes snark

* Fixes a bug that wasn't my fault (for real)

* Adds tiers.

* Phasic sounds cooler

* Fixes sprites
 2017-12-03 17:36:51 -06:00
Anewbe
5fffb9d51f Merge pull request #4378 from Neerti/12/1/2017_reaching_weapons 
Adds Reach Variable to Weapons
 2017-12-02 12:00:26 -06:00
Anewbe
132168bc81 Further parachute functionality 2017-12-01 22:11:38 -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
Layne
3f21df1ae2 Fixy fixy. (#4314) 2017-12-01 16:18:20 -06:00
mistyLuminescence
4d44d47a59 Mobile Camera Pods (#4330) 
* Adds tactical cameras!

* Adds MCP crate

* Destroy the tac-cams!

* Updates description

* Removes MCP box from Armory

* we can't actually get MCPs any more
 2017-12-01 16:00:49 -06:00
Neerti
5796b14220 Adds Reach Variable to Weapons 
Melee weapons can now potentially attack from farther away.
Obstacles are taken into account, so you cannot hit people through windows, but you can attack over specific things such as tables, or other people.
Currently only the spear can do this, with a range of two tiles, however the attack speed for the spear was reduced, so it may remain a situational weapon.
The intention for this is to make specific weapons feel different to each other besides 'does more damage', and I got ideas on other kinds of weapon adjustments later to make them feel a bit more unique.
 2017-12-01 12:42:40 -05: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
70d49a1c3a Merge pull request #4181 from Anewbe/radiation_tweaks 
Adjusts how radiation works, especially for FBPs
 2017-11-29 21:17:16 -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
Neerti
8fedfa205f Merge pull request #4357 from Cyantime/communicator 
Allows communicators to be made by RnD, shows ghosts communicator IMs
 2017-11-27 20:19:59 -05:00
Anewbe
1cb9503790 Merge pull request #4344 from MisterLayne/you_do_not_hold_the_conch 
Fixes One Crew Member Law
 2017-11-27 15:37:23 -06:00
Cyantime
209b354fd4 Allows communicators to be made by RnD, shows ghosts communicator IMs 2017-11-27 00:33:49 -05:00
Anewbe
99a0c6cd67 Corrects a compile error 2017-11-26 18:13:34 -06:00
Anewbe
1591fdcc81 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radiation_tweaks 
# Conflicts:
#	code/game/objects/items/devices/defib.dm
 2017-11-26 17:53:00 -06:00
Neerti
01aaccf893 Finishes UFO PoI 2017-11-26 15:10:25 -05:00
MisterLayne
ab83bb90be One Crew Member 2017-11-26 12:28:59 -05:00
Neerti
5b0b639377 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi 
# Conflicts resolved:
#	maps/submaps/cave_submaps/cave_areas.dm
 2017-11-26 12:09:55 -05:00
Neerti
7497aef295 work 2017-11-26 12:08:05 -05:00
Anewbe
d524d721b9 Merge pull request #4335 from Neerti/11/22/2017_explorer_gear 
Adds Exploration Equipment
 2017-11-25 14:39:12 -06:00
Neerti
8ac2100fa2 Adds Exploration Equipment 
Ports and tweaks the Explorer gear from /tg/. Recolored to remove the mining purple, instead its now a nice blue because winter, I suppose.
Adds a new survival knife that is bootknife ready.
Replaces xenoarch GPS with budget /tg/ GPS that is more useful, as it can track other GPSes.
 2017-11-24 07:22:35 -05:00
Cyantime
9ba6d5759a Fixes 'reques console' 2017-11-22 18:25:49 -05:00
Anewbe
62d76cba30 Merge pull request #4318 from Mechoid/Mechoid_Has_The_Keys_And_A_Brick_On_The_Pedal 
Adds more Spiders. Touches cuff-code tangentially.
 2017-11-22 01:13:04 -06:00
Mechoid
d5404ae0eb Adds More Spiders. Touches cuff-code tangentially. 2017-11-21 12:59:06 -08:00
Neerti
cc616148e3 Merge pull request #4291 from mistyLuminescence/FisforFriendswhoDoStuffTogether 
Adds bracelets!
 2017-11-21 01:32:35 -05:00
Neerti
d36d09d937 Merge pull request #4176 from Anewbe/battery_things 
Swaps non-mounted recharging guns to batteries
 2017-11-19 21:28:06 -05:00
Anewbe
1fb2e32e2f Merge pull request #4297 from Neerti/11/18/2017_make_syndie_toolboxes_special_again 
Makes Syndie Toolboxes Special Again
 2017-11-19 17:25:44 -06:00
Neerti
d8b26358ce Merge pull request #4278 from Anewbe/defib_charge 
Successful Defibs are more costly, chargewise.
 2017-11-19 17:50:13 -05:00
Neerti
595f874f9b Merge pull request #4264 from Anewbe/decap_defib 
Decapitation now stops defibrillation
 2017-11-19 17:50:03 -05:00
Belsima
594625cf81 Adds force to a pair of items that were lacking for some reason, and standardizes light replacer file. (#4280) 
* Adds force to lamps.

* Standardization.

* Standardizes a few things.

* Grammar that I missed.

* Some more missed grammar.
 2017-11-19 02:52:56 -06:00
Anewbe
fd7990028f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into battery_things 2017-11-19 02:38:42 -06:00
Neerti
4263a9b70b Makes Syndie Toolboxes Special Again 
The syndie toolboxes have been split into two versions, one with the old contents pre-powertools and one with the current powertools. Both are in the uplink, however only the regular tool version of the syndie toolbox can be found in maint now. This is to make power tools less commom, as there are several spots where syndie toolboxes are guaranteed to spawn at,  and it made the CE's tools less special.
 2017-11-18 08:06:38 -05:00
Anewbe
98787bc2ef Merge pull request #4285 from mistyLuminescence/defibghost 
Fixes ghost defib message bug
 2017-11-17 20:12:57 -06:00
Anewbe
9191bfe6f7 Adjusts original PR as per Staff request 2017-11-17 16:11:05 -06:00
Anewbe
2a55433ca9 Merge pull request #4276 from Neerti/11/16/2017_get_out_of_here_stalker 
Tweaks Geiger Counters
 2017-11-17 16:05:40 -06:00
Anewbe
d1d5ec3887 Merge pull request #4271 from Mechoid/Nano-Pasta 
Nanopaste Tweaks
 2017-11-17 15:59:14 -06:00
mistyLuminescence
3a19bf7c2b Fixes ghost defib message 2017-11-17 21:28:41 +00:00