cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 20:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,873 Commits 8 Branches 26 Tags
d68629fc809fb34ccd0405345a5bfaa818747c8d
Commit Graph

4422 Commits

Author SHA1 Message Date
Arokha Sieyes
9bc7510e26 POLARIS: Tweak weird MA override 
Not sure when this is used, but Leshana had a good suggestion for preventing it interfering with things.
 2018-02-24 11:44:57 -05:00
Leshana
30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-02-23 21:55:42 -05:00
Anewbe
328a7c54df Merge pull request #4926 from VOREStation/vplk-gas-turbine 
Make gas turbine constructable and operational
 2018-02-23 13:16:56 -06:00
Atermonera
0f2ef45d71 Merge pull request #4922 from Anewbe/flashbang_stun 
Should actually fix the flashbang thing, hopefully without a billion extra commits
 2018-02-22 20:11:02 -08:00
Atermonera
4e9a1a0fba Unobfuscates GPS locations (#4910) 
* Makes GPS units more useful, adds helper to give more useful dir strings

* Re-obfuscates PoI gps locations

They keep adir direction though, so finding them should generally be easier

* Re-obfuscates PoI gps locations
 2018-02-22 22:10:18 -06:00
Atermonera
410aca398e Adds halogen counter tool, adds gas scanner to analyzers (#4903) 
* Adds halogen counter tool, adds gas scanner to analyzers

* Appeases travis

* Missed a tag
 2018-02-22 15:01:25 -06:00
Leshana
a1bfd1fb46 Make gas turbine constructable and operational 
* Make gas turbine constructable, as well as modernizing its code. Borrowed some from /tg
* Converted the gas turbine control computer to nano ui.
 2018-02-22 15:43:38 -05:00
Aronai Sieyes
0d4452e78f Merge pull request #3098 from VOREStation/vplk-candles 
Stop candles from messaging the universe when they light.
 2018-02-22 12:27:58 -05:00
Aronai Sieyes
94cdc508bc Merge pull request #3068 from VOREStation/vplk-timeclock-i 
Adds Timeclock Terminals: A machine for viewing your PTO balance.
 2018-02-22 12:27:09 -05:00
Leshana
effd302072 Stop candles from messaging the universe when they light. 2018-02-22 10:17:49 -05:00
Anewbe
51420a0aa7 Flashbangs no longer Stun() 2018-02-22 02:20:25 -06:00
Anewbe
251535e766 Merge pull request #4913 from Cyantime/patch-2 
Robot upgrade fixes
 2018-02-21 23:08:48 -06:00
Anewbe
01ae959020 Merge pull request #4865 from Atermonera/umbrella 
Adds umbrellas
 2018-02-21 23:06:44 -06:00
Anewbe
c06fe44755 Merge pull request #4907 from VOREStation/pol-spybugs 
Make spy bugs spawn spy cameras
 2018-02-21 22:40:03 -06:00
Anewbe
21592606b7 Merge pull request #4898 from Mechoid/Mining_Optimization 
Mining Bag / Box Speedification
 2018-02-21 16:15:16 -06:00
BillyBangles
5486edf567 Adds various cabin-related things. (#4888) 
* adds fireplace, makes bonfire generate heat

kinda, anyways

* adds sifwood tiles, fixes old blue carpets

old blue carpets are now known as "teal carpets." they still come in the
carpet crate from cargo.

* lets you dig up tree stumps with shovels

* changelogs in the house

* adds a delay to digging up stumps

digging up stumps is easier said than done
 2018-02-21 15:45:01 -06:00
Cyantime
b0a8ebcbb7 Robot upgrade fixes 2018-02-21 13:12:34 -05:00
Anewbe
dfdafddaa9 Merge pull request #4897 from VOREStation/pol-analfix 
Fix health analyzer names
 2018-02-21 10:03:09 -06:00
Anewbe
a6653bf00a Merge pull request #4896 from VOREStation/pol-qdels 
Fix several Destoy()s
 2018-02-21 10:01:23 -06:00
Atermonera
a34b28a240 Merge pull request #4885 from Anewbe/package_bombs 
Tones down package bombs
 2018-02-21 00:34:59 -08:00
Arokha Sieyes
20c145aafc Make spy bugs spawn spy cameras 
They are just using New() from their parent which spawned a normal camera. Now they store a type.
 2018-02-20 23:29:59 -05:00
Arokha Sieyes
3fdafb7194 Rename medical scanners and update map 2018-02-20 19:25:31 -05:00
Mechoid
d3cc476eb0 Un-fub comments. 2018-02-20 13:57:51 -08:00
Mechoid
a2c30eb699 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mining_Optimization 2018-02-20 12:58:38 -08:00
Mechoid
8a3dcc5cc1 Makes Mining Satchels brute-force their way out of lagging, minerborg prodding. 2018-02-20 12:58:13 -08:00
Anewbe
25a1f47a30 Headset sprites, planetside headset functionality (#4869) 2018-02-20 12:36:22 -08:00
Arokha Sieyes
0c0f09fe68 POLARIS: Fix several Destroy()s 2018-02-20 10:00:23 -05:00
Arokha Sieyes
a75cfe0eb1 POLARIS: Fix several Destroy()s 2018-02-20 00:20:46 -05:00
Aronai Sieyes
7cae95d35c Merge pull request #3080 from VOREStation/aro-exbox 
Explorer box gets goggles
 2018-02-19 17:23:10 -05:00
Anewbe
14196a9404 Tones down package bombs 2018-02-19 15:45:21 -06:00
Arokha Sieyes
3841dde58c Explorer box gets goggles 2018-02-19 16:16:52 -05:00
Anewbe
9c1645257b Merge pull request #4875 from VOREStation/pol-boxes 
Moves most boxes to use starts_with
 2018-02-19 13:57:23 -06:00
Leshana
805b7f7b78 Make gas turbine constructable and operational 
* Make gas turbine constructable, as well as modernizing its code. Borrowed some from /tg
* Converted the gas turbine control computer to nano ui.
 2018-02-18 21:21:50 -05:00
Leshana
31b8e30aac Adds Timeclock Terminals: A machine for viewing your PTO balance. 
* Timeclock machine and NanoUI template.
* Circuit board for construction.
* Frame datum for construction on walls.
* Sprites by VerySoft
 2018-02-18 20:42:22 -05:00
Arokha Sieyes
9f74137a87 VS: Specific changes for boxes and pumps 2018-02-18 19:38:01 -05:00
Anewbe
3e51ed06cf Cryobag oxygen supply increased (#4866) 2018-02-18 11:48:30 -08:00
Arokha Sieyes
3178b95b6c POLARIS: Moves most boxes to use starts_with 2018-02-18 13:29:21 -06:00
Arokha Sieyes
cabe2676e9 POLARIS: Moves most boxes to use starts_with 2018-02-18 13:03:05 -06:00
Anewbe
e588d6ad98 Ghetto splints now spawn properly when used in hand (#4857) 2018-02-18 01:09:34 -08:00
Arokha Sieyes
5ec475d563 Travis bull 2018-02-18 00:37:00 -06:00
Arokha Sieyes
5967bb6dc5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-6.dmm
 2018-02-18 00:25:36 -06:00
Aronai Sieyes
b1b2551b9c Merge pull request #3058 from VOREStation/aro-joinspeed 
Half character-join lag
 2018-02-17 23:41:05 -06:00
Arokha Sieyes
0dd7a2e2e3 Initial cleanup/changes 2018-02-17 19:47:39 -06:00
atermonera
4197a0c117 Adds umbrellas sprites courtesy of schnayy 2018-02-17 13:30:50 -08:00
Anewbe
7cc8fa0cba Gives Miners shinybits. (#4840) 
* Gives miners marker beacons, moves their locker to another file

* Makes marker beacons ITEM_SIZE_SMALL
 2018-02-17 11:19:48 -08:00
Anewbe
077b73a446 Suit coolers don't magically shut off in mild fires (#4820) 2018-02-17 11:19:21 -08:00
Anewbe
16295de3cf Merge pull request #4829 from VOREStation/pol-ghostbox 
Lets animals and ghosts look in boxes/backpacks/whatever
 2018-02-17 10:06:06 -06:00
Anewbe
329a65be08 Merge pull request #4838 from VOREStation/pol-emerboxes 
Port Bay's survival boxes
 2018-02-17 10:05:39 -06:00
Leshana
7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16 
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
 2018-02-17 00:35:29 -05:00
Aronai Sieyes
81f946c724 Merge branch 'master' into pol-ghostbox 2018-02-16 22:22:35 -06:00