cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 04:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,748 Commits 8 Branches 26 Tags
ed525cef2ca92d666d57ecdfd662113dd7fe85ec
Commit Graph

7671 Commits

Author SHA1 Message Date
Spades
ea056f6b88 Merge pull request #4316 from VOREStation/upstream-merge-5628 
[MIRROR] Minor issues fix.
 2018-10-08 20:29:08 -04:00
Spades
f379ea2df4 Update weldingtool.dm 2018-10-07 17:55:35 -04:00
Spades
b1b565c352 Update weldingtool.dm 2018-10-07 17:55:01 -04:00
Spades
91a67b6b37 Update weldingtool.dm 2018-10-07 17:54:35 -04:00
Spades
8c2e0928fa Merge pull request #4130 from KasparoVy/fix-tesh-hide-again 
Fix Teshari Hiding Again
 2018-10-06 08:25:35 -04:00
Atermonera
fafd85957f Minor issues fix. 2018-10-06 01:17:19 -04:00
Anewbe
9498d6f7db Merge pull request #5619 from SpadesNeil/toy-sounds 
Text for handheld plushies when poked
 2018-10-02 14:20:47 -04:00
Spades
4a00acc6d4 Merge pull request #4291 from VOREStation/upstream-merge-5613 
[MIRROR] Custom RIG Framework
 2018-10-01 09:30:24 -04:00
Spades
b8f240f199 Merge pull request #4282 from VOREStation/sync-09272018 
Polaris Sync 09-27-2018
 2018-10-01 08:43:03 -04:00
Mechoid
78b173b50a Custom RIG Framework (#5613) 
* Framework for Custom RIG sprites.

* Fixfix
 2018-09-30 17:50:39 -04:00
Spades
9e86743d00 Merge pull request #4163 from Mewchild/MC-Syringes 
Reverts Syringe infections
 2018-09-27 19:38:08 -04:00
Arokha Sieyes
cb43ac69ea Satisfy stupid indentation.awk, which is just wrong. 2018-09-27 18:22:55 -04:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Mechoid
b7231dc8cc Don't spawn things in Null please. 2018-09-23 00:24:34 -07:00
Wickedtemp
21878523b1 Adds the Biopsy Scanner to the Surgery Kit (#5589) 
* Adds the Biopsy Scanner to the Surgery Kit

Since it's actually used in a surgical operation, it should proooobably be in the kit. Iunno if the kit is really used here aside from antag shuttles, but they might as well have it.

* Added a missing comma

Missed a comma, might be what's causing issues. Iunno. It worked flawlessly in dream-maker.
 2018-09-22 18:53:36 -05:00
Atermonera
46f151745f Merge pull request #5581 from Anewbe/mining_toys 
Technically adds the Ore Redemption Machine
 2018-09-22 13:38:10 -07:00
Anewbe
6e4a77f010 Boot knives fit in boots 2018-09-19 15:42:08 -05:00
Neerti
aec83fd4f2 Merge pull request #5577 from Anewbe/grilles 
Fixes a couple of tool related oversight/runtimes
 2018-09-19 16:08:37 -04:00
Neerti
b17b2f63ce Merge pull request #5578 from Anewbe/cuffs 
Fixes hand and leg cuffs
 2018-09-19 16:08:11 -04:00
Anewbe
3d4bed20c2 Merge pull request #5548 from Poojawa/pls-stop-moosic 
Ports /vg/ instrument frame work, adds client based sound pref toggle.
 2018-09-19 15:04:06 -05:00
Anewbe
c35b99e315 Technically adds the Ore Redemption Machine 2018-09-19 02:04:10 -05:00
Anewbe
5fb0e06a5a Fixes hand and leg cuffs 2018-09-18 14:32:54 -05:00
Anewbe
765106986d Fixes a couple of tool related oversight/runtimes 2018-09-18 14:00:43 -05:00
Atermonera
c8dc627af4 Merge pull request #5573 from Mechoid/Blob2_Revenge_Of_The_Blob 
More Blob modularity / Event-Manager compatability, Nests.
 2018-09-18 11:11:51 -07:00
Atermonera
77ef274b98 Merge pull request #5553 from Mechoid/VroomVroom 
Vehicle Expansion 1: Zoom Harder
 2018-09-17 11:14:54 -07:00
Spades
c29cea0e9f Merge pull request #4123 from Zap-zapper/sleevemate 
[FEATURE]Sleevemate new functions
 2018-09-17 14:12:07 -04:00
Mechoid
4fb5455fd3 Makes Blobs more useful. 2018-09-16 22:12:17 -07:00
Anewbe
8094bbd746 Merge pull request #5564 from Woodratt/09112018_Mapbugfix 
Map Bugfixes
 2018-09-12 21:03:37 -05:00
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549) 
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
 2018-09-12 20:51:32 -05:00
Woodratt
ea200b8318 Map Bugfixes 
-	Fix for mislabeled c_tag cameras, first deck
-	Fix for mislabeled c_tag cameras, second deck
-	Fix for poi crashed containment shuttle mapping issues (terrain generation)
-	Fixed wrong floor type on skipjack
-	Fix for scrubbers pipe, central substation
-	Fix for air supply pipe, chapel
-	Fixed scrubber pipe, Engineering Drone Fab
-	Fix for air supply pipe, Prison Wing
-	Removed redundant supply and scrubber pipe, Security Auxiliary Dock
-	Fix, Fore Aux Dock airlock pipe.
-	Fix air supply pipe, library
-	Fix, scrubber pipe, coffee shop
-	Pipe fix, Medical maint
-	Fix, supply pipe medical secondary storage
-	Removal, redundant supply pipe, cargo maint
-	Fix, virology scrubbers pipes
-	Fix Xenobio and Xenoflora missing atmos connection to the main outpost
-	Fix, missing atmos connections between Main outpost telecoms and main outpost atmos
-	Fix for missing power wires, HoS Office, Warden Office, Heads of Staff Meeting Room
-	New, random mouse spawner
-	New, random mouse spawners added throughout maintenance on the station (maybe too many, maus station 13)
-	New, 30 sheets of lead added to engineering
-	Fix, POIs should now be rad protected and characters won’t be affected by the radiation event
 2018-09-11 21:39:46 -07:00
Spades
1eaa3266ba Merge pull request #4088 from VOREStation/upstream-merge-5446 
[MIRROR] Fireaxe cabinets find their fireaxes in initialize(), rather than new()
 2018-09-10 07:02:36 -04:00
Spades
50c0c7bedf Merge branch 'master' into upstream-merge-5446 2018-09-09 17:58:23 -04:00
Spades
eb94467f39 Merge branch 'master' into upstream-merge-5432 2018-09-09 17:57:31 -04:00
Neerti
74f70c940b Merge pull request #5522 from Atermonera/PDA_comms2 
Implements commcards (Communicator cartridges)
 2018-09-09 03:06:21 -04:00
Mechoid
0651206a51 Refactor cargo trains, they're just normal trains now. Adds the Quad, and re-enables/fixes the Space Bike! 2018-09-08 23:05:08 -07:00
Spades
26a227b342 Merge pull request #4065 from VOREStation/upstream-merge-5427 
[MIRROR] Fixes the fireaxe cabinet
 2018-09-07 10:50:27 -04:00
Poojawa
5d0328d0e5 fixes the trailing tag, I think 2018-09-05 21:42:27 -05:00
Poojawa
6b403022a7 Ports /vg/ instrument frame work, adds client based sound pref 
Also shifts sound files which is 98% of the bulk here.
 2018-09-05 03:35:34 -05:00
Anewbe
4cebe1cfb9 Merge pull request #5541 from Atermonera/rotate_submap 
Submaps can be rotated
 2018-09-04 22:41:19 -05:00
Atermonera
6acab6f2bb Merge pull request #5544 from Anewbe/grilles 
Should fix another runtime with tools
 2018-09-02 21:14:02 -07:00
atermonera
24c4c6dd9f Ready for merge 2018-09-02 14:16:00 -07:00
Spades
8b7fbbe98c Merge branch 'master' into upstream-merge-5424 2018-09-01 18:40:37 -04:00
Spades
af3df2f511 Merge pull request #4110 from VOREStation/upstream-merge-5455 
[MIRROR] Added Squid plushies of varying colours
 2018-09-01 18:25:21 -04:00
Anewbe
85a754480a Should fix another runtime with tools 2018-08-31 22:14:15 -05:00
atermonera
2f9cebd38d Submaps can now be rotated to any cardinal direction (South is default) 2018-08-31 01:32:26 -07:00
Mechoid
69ad0ce12b Cult Girders are back to being proper. 2018-08-30 22:21:21 -07:00
Anewbe
f79a0cb9a6 Merge pull request #5527 from Mechoid/Neural_Implant 
Adds a Neural implant for future implementation.
 2018-08-30 23:23:32 -05:00
Mechoid
268d91ec02 Defines. 2018-08-28 21:48:14 -07:00
Mechoid
31761714b2 Adds a Neural implant for future implementation. Promethean brains have been updated to fit it. 2018-08-28 01:23:36 -07:00
Anewbe
9d8a19ab5d Cleave changes, attack code cleanup 2018-08-27 01:18:49 -05:00