Kelshark
b0d5dba835
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
# code/modules/mob/living/silicon/robot/robot_modules_vr.dm
# config/custom_items.txt
2017-11-25 11:49:28 -05:00
Kelshark
33d109b2dd
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-11-25 11:35:10 -05:00
killer653
463b9c4dfb
Edited files
2017-11-17 19:28:26 -05:00
killer653
da0bf3743b
Polaris sync
2017-11-17 19:27:03 -05:00
mistyLuminescence
0431c2d23c
Changes the old hyposprays to the new hyposprays. ( #4223 )
...
* Hypospray mk1 -> Hypospray mk2
* Medical random spawns no longer have the new hypo.
* Medic syndiecrate now has the old hypo
2017-11-15 16:31:50 -06:00
Mechoid
34eef27b7b
Merge pull request #4215 from Anewbe/gym_equipment
...
Ports Bay's gym equipment
2017-11-10 18:47:49 -08:00
killer653
70e53b96bb
Polaris Sync
2017-11-10 11:37:41 -05:00
Kelshark
8b32b39c6f
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-11-07 08:17:53 -05:00
mistyLuminescence
9dad109f22
Putting wielded fire axes back now works correctly.
2017-11-06 10:27:55 +00:00
Sabess
c96781499f
Allows detectives to take an optional revolver + some other stuff ( #4217 )
...
* I'm like 99% sure this works
* uhm
* accidentally broke something after I tested but before I PRed, fixed now
2017-11-05 22:53:11 -06:00
Anewbe
1126523497
Merge pull request #4202 from mistyLuminescence/mappingstuff
...
Chemist and Psychiatrist locker fixes, for real this time.
2017-11-05 20:08:34 -06:00
Anewbe
f1e939c397
Ports Bay's gym equipment
2017-11-04 18:53:18 -05:00
killer653
11c195debb
Polaris Sync
2017-11-04 13:37:13 -04:00
Anewbe
7e62570129
Merge pull request #4205 from MisterLayne/LostDroneCharger
...
Lost Drone Pod Charger
2017-11-03 23:38:43 -05:00
mistyLuminescence
41f332df42
fuck this pr PART TWO
2017-11-04 00:00:07 +00:00
mistyLuminescence
a0c5ecb8d5
UPDATES IT FOR REAL THIS TIME
2017-11-03 23:29:14 +00:00
MisterLayne
2be106026b
Makes lost drone pod charger-able.
2017-11-03 14:26:59 -04:00
Cyantime
31f5321dcc
Window things
2017-11-02 23:58:20 -04:00
Anewbe
6611cb271b
Merge pull request #4190 from mistyLuminescence/plushierework2561
...
Plushie tweaks!
2017-11-01 21:57:56 -05:00
mistyLuminescence
f67a3858cd
Plushie tweaks!
2017-10-31 15:47:00 +00:00
Woodratt
e639887584
SC Arrivals Shuttle fix
...
- Fixes issues with the SC arrivals shuttles in regards to airlocks
- New Shuttle seats, ported from Vorestation
2017-10-30 15:56:44 -07:00
Kelshark
92980edc93
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/jobs/job/science.dm
# code/modules/mob/living/carbon/human/species/station/human_subspecies.dm
# code/modules/mob/living/carbon/human/species/station/seromi.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# config/custom_items.txt
2017-10-29 18:14:56 -04:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Anewbe
073fd9524c
Adjusts outfits again
2017-10-25 02:24:15 -05:00
ForFoxSake
d7c9eef7e1
Makes windows less invulnerable.
2017-10-22 13:26:39 +01:00
Yumi (AKA Gowst)
7b87993993
Adds halloween pumpkins and jack-o'lanterns, pumpkins replaces all potted plants on station
2017-10-20 00:52:16 -05:00
mistyLuminescence
e76447a719
Loadout stuff, but done right! ( #4094 )
...
* Loadout and accessory path tweaks.
* updated: armbands
* except it's better now
* no ian shirt and psych medHUD, travis fixed?
* OKAY ROUND THREE
2017-10-19 09:36:15 -05:00
Anewbe
ef735ea89b
Merge pull request #4098 from Neerti/10/15/2017_surface_stuff
...
Touches Up the Surface Somewhat
2017-10-19 09:36:03 -05:00
Neerti
95d93dae00
Touches Up the Surface Somewhat
...
Changes the rock texture to hopefully be a bit better. It's a recolored version of /tg/'s lavaland rock, and modified slightly to look less repetitive.
Ports the lavaland rock tile sprite entirely for future away missions.
Adds tree chopping down feature. All trees now have health, and hitting it with things will reduce it. Generally you need something sharp to have a chance of actually felling the tree.
Adds log material, which is obtained from chopping trees. Hitting these with a sharp weapon converts them into two planks per log. Can be used to build log walls but otherwise can't be used to craft, at the moment.
Ports /tg/ tree sprites. Might have a use for them in away missions, who knows.
Makes crystals start anchored and glow.
Shoveling snow checks toolspeed now.
2017-10-18 12:04:39 -04:00
Kelshark
3ab70b7996
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/objects/items/weapons/tools.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# config/custom_items.txt
# vorestation.dme
2017-10-17 08:49:37 -04:00
Spades
edfa947278
These are not Vorestation edits. ( #4088 )
...
Y'all are confusing the shit out of us.
2017-10-16 23:01:30 -05:00
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
Neerti
7b5f8bddd1
Merge pull request #4081 from Cameron653/512_FILTER_FIX
...
BYOND 512 Compiling Errors Fix
2017-10-16 18:47:47 -04:00
mistyLuminescence
f87a6d7d8c
Adds a white robe. ( #4074 )
...
* - Adds a hooded robe themed after the Rishizirr, the mythological Tajaran angels of death said to shepherd the souls of those who die while snowed in to their designated afterlife. Perfect for Hallowe'en!
* Adds a hooded white robe.
* Fixes the white robe.
* Fixes the robe, again
2017-10-16 04:27:03 -05:00
killer653
0080539924
More fixes
2017-10-15 19:54:50 -04:00
Ansari
768dc2d7c0
Port over Chemistry bag from Paradise ( #4067 )
...
* Add in chemistry bag from Paradise, based on /tg/ bag. Add it to biogenerator. Add it to wardrobe.
* Make itemsize large so it cannot be put in backpack. Slowdown = 1.
2017-10-15 15:04:56 -05:00
MisterLayne
392aa1d8bc
Makes the new T-Ray Scanners available
2017-10-11 17:11:49 -04:00
Cameron Lennox
e650c62c6b
LOTS OF FIXES
2017-10-08 18:05:27 -04:00
Cameron Lennox
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
Anewbe
ccd90031fa
Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci
...
Science Dufflebag
2017-10-06 10:51:05 -05:00
MisterLayne
8aed98be14
Adds science dufflebag
2017-10-05 16:26:56 -04:00
Neerti
cf263e348e
Merge pull request #3981 from Anewbe/gravetender
...
Adds the gravekeeper lost borg module
2017-10-03 23:01:15 -04:00
Spades
54d4069eff
Merge pull request #2195 from Verkister/returnofthelongpup
...
Re-enables and fixes the CARGO EXCLUSIVE oties. Plus a couple new features! (Psst hey)
2017-10-03 22:31:24 -04:00
Kelshark
9e4136784d
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
# config/jobwhitelist.txt
# icons/mob/species/akula/mask_vr.dmi
# icons/mob/species/fennec/mask_vr.dmi
# icons/mob/species/fox/mask_vr.dmi
# icons/mob/species/nevrean/mask_vr.dmi
# icons/mob/species/vulpkanin/mask.dmi
# icons/mob/vore/taurs_vr.dmi
2017-10-03 19:04:51 -04:00
Spades
aa10a65b30
OSHA approved map changes
...
- More fire lockers and oxy closets in places.
- All elevator entrances have emergency shutters in front of them, which
can be used as a defacto airlock if needed.
- All fire closets have emergency toolboxes now.
- Other minor map edits.
2017-10-03 02:49:45 -04:00
Neopatra
2503183c21
Adds Taur hazmat and Rad suits to lockers
...
As well as bomb suits.
2017-10-01 09:30:32 -04:00
Anewbe
4dd9a4dbf2
Corrects the autospawn pod timer
2017-09-30 21:38:23 -05:00
Anewbe
d067f70403
Adds the thing that spawns the gravekeeper drone
2017-09-30 02:00:10 -05:00
Mechoid
77f0e7514c
Combat exosuits can now actually punch through walls and girders again, based on their 'force'. Fixes some to_chat's.
2017-09-29 22:10:48 -07:00
Anewbe
7a13c8136f
Finishing touches on gravemarkers
2017-09-27 18:59:26 -05:00
