cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 23:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,090 Commits 8 Branches 26 Tags
a8a42da0419e5cbbd37a9da134ae4cfa2139fe57
Commit Graph

14882 Commits

Author SHA1 Message Date
Arokha Sieyes
ff452d5be9 Undoes species economic modifiers from Polaris, leaves them all at the human amount 2018-04-25 17:53:10 -04:00
Arokha Sieyes
6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018 
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	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-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
 2018-04-25 17:23:33 -04:00
Atermonera
7d6fba3ba1 Merge pull request #5194 from Anewbe/species_economic 
Species economic modifier is now a species var
 2018-04-24 23:26:41 -07:00
Leshana
c09412c33e Implements the Mining Equipment Vendor 
Adds the Mining Equipment Vendor machine, which sells lots of items for points earned by mining.
Enhanced the ore processor to give points for processed ore.
Added some miscellaneous items such as hyposprays for miners.
Switched mining machines to use the nice new icons.
 2018-04-24 18:18:54 -04:00
Leshana
218c17d268 Ported laser pointer. It lets you point at stuff with lasers. 2018-04-24 12:59:27 -04:00
Leshana
43b8c1720c Adds the Kinetic Accelerator 
A mining gun, this upgradable energy weapon can mine mineral turfs at a distance.  It does only 25% of nominal damage when fired indoors.
It can be upgraded with modkits, giving it range, pretty colors, aoe against minerals or mobs.
 2018-04-24 12:59:23 -04:00
Leshana
051384ee22 Adds the Resonator 
A device which sets up resonating energy fields which collapse, mining mineral turfs and/or doing damage to any mobs standing inside.  Does no damage to anything else, and damage to mobs is only high when used in low temperature environment (such as... outside or in space)
Uses quite a few dmis, for the icons, in hand icon, and effect icons.  Includes sound effects
Ported from tg and Paradise
 2018-04-24 12:57:50 -04:00
Arokha Sieyes
d5c9d3cb4e Port /tg/ lavaland shelters 
Nanotech twist rather than bluespace, but whatever.
 2018-04-23 15:25:35 -04:00
Anewbe
152093cda0 Merge pull request #5197 from VOREStation/port-3500-brig-timers 
Rewrite brig timers to initialize properly
 2018-04-22 11:52:21 -05:00
Anewbe
4a039d94a5 Merge pull request #5196 from Schnayy/plushiefix 
Carp Plushie Fix
 2018-04-22 11:49:52 -05:00
Arokha Sieyes
856a6db696 Rewrite brig timers to initialize properly 2018-04-20 12:04:02 -04:00
Schnayy
b56299cc57 - Fixes carp plushies to now have a base sprite & be selectable in the loadout. 
- Adjusts gift vendor to have a few of the newer plushies, as well as change them to cost thaler rather than a coin.
- Champagne is now a premium item rather than contraband.
 2018-04-20 09:55:09 -05:00
Leshana
438203393e POLARIS: Fix cutting of bedsheets while holding them. 
Cutting bedsheets while holding them dropped the resulting rags in the mob's contents.
 2018-04-19 20:51:25 -04:00
Aronai Sieyes
fa8f21673c Merge pull request #3506 from VOREStation/aro-portallocal 
Fix cascade portal teleporting
 2018-04-19 20:30:34 -04:00
Aronai Sieyes
6f57022a0c Merge pull request #3448 from VOREStation/aro-taurriding 
Lazily implements taur riding
 2018-04-19 20:21:46 -04:00
Arokha Sieyes
86a0536705 Fix cascade portal teleporting 2018-04-19 20:17:29 -04:00
Anewbe
323d3aa42c Species economic modifier is now a species var 2018-04-19 18:06:02 -05:00
Arokha Sieyes
7e993c95d3 Rewrite brig timers to initialize properly 2018-04-19 18:28:57 -04:00
Mechoid
d362541220 Fixes mob wall-bashing. 2018-04-18 21:53:58 -07:00
Atermonera
35b60f19f8 Merge pull request #5175 from Anewbe/selective_aooc 
Removes AOOC from non-team antags
 2018-04-18 14:21:01 -07:00
Aronai Sieyes
35ec513b28 Merge pull request #3452 from VOREStation/aro-sync-04122018 
Polaris Sync 04-12-2018
 2018-04-18 14:04:27 -04:00
Aronai Sieyes
80c8bb5e34 Merge branch 'master' into aro-taurriding 2018-04-18 14:01:50 -04:00
MarinaGryphon
9e57b11a87 Fixes various implant/admin verb typos (#5177) 
* Removes 'independant'

* Update Space Station 13 areas.dm

* Fixes the AI law typo

* Fixes another typo.

Somewhat out of scope(?), but it's just a typo.
 2018-04-17 23:05:12 -05:00
Anewbe
c29d830e28 Merge pull request #5166 from Heroman3003/closet-coloring-fix 
Fixed closet painter making non-closet 'closets' invisible
 2018-04-17 23:04:43 -05:00
Leshana
989d8a727d POLARIS: Fix cutting of bedsheets while holding them. 
Cutting bedsheets while holding them dropped the resulting rags in the mob's contents.
 2018-04-17 20:24:06 -04:00
Leshana
b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14 
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
 2018-04-15 14:19:36 -04:00
Anewbe
8cafd92f27 Removes AOOC from non-team antags 2018-04-14 23:25:34 -05:00
Anewbe
fd29a3b841 Merge pull request #5165 from VOREStation/port-fix-wall-frames 
Fix Wall Frames - Several Ways
 2018-04-13 14:03:34 -05:00
Anewbe
8adf777a72 Merge pull request #5167 from Heroman3003/sheet-snatch-fix 
Fixed sheet snatcher spawning stacks with wrong looking icon
 2018-04-13 14:01:17 -05:00
Anewbe
337e5e7436 Merge pull request #5164 from Heroman3003/legcuffies 
Fixed legcuffs not being placeable on handcuffed people
 2018-04-12 17:43:37 -05:00
Aronai Sieyes
83c27b175f Merge pull request #3446 from Heroman3003/fuzzy-legcuffs 
Added fuzzy legcuffs
 2018-04-12 18:42:54 -04:00
Arokha Sieyes
1273ca9ed4 Lazily implements taur riding 
It's pretty lazy. I'm sure someone with *effort* can touch it up.
 2018-04-12 15:10:17 -04:00
Heroman3003
1ff2f26889 Fixed legcuffs checking for being handcuffed instead of legcuffed when put on 2018-04-13 05:00:18 +10:00
Heroman3003
dd2a46281e Added fuzzy legcuffs 2018-04-13 04:56:16 +10:00
Aronai Sieyes
5ff4f49cba Merge pull request #3437 from Verkister/patch-14 
Fixes teal carpets.
 2018-04-12 11:51:58 -04:00
Aronai Sieyes
298def0af5 Merge pull request #3438 from Verkister/dur 
Adds deer taur.
 2018-04-12 11:51:42 -04:00
Aronai Sieyes
8afd5cad9a Merge pull request #3441 from Verkister/rous 
Adds giant rat voremob.
 2018-04-12 11:51:29 -04:00
Heroman3003
32daa7a0d2 Fixed sheet snatcher spawning stacks with wrong looking icon 2018-04-12 21:55:24 +10:00
Heroman3003
d63e611554 Fixed closet painter making non-closet 'closets' invisible 2018-04-12 21:47:43 +10:00
Verkister
90175bb1aa adds proper bags 2018-04-12 09:26:02 +03:00
Leshana
ec5d6fe44c Switch frame construction menu to have a cancel button. 
Instead of having a whole frame type dedicated to giving a "Cancel" option... lets just tell BYOND to add a cancel button to the menu.
 2018-04-11 23:14:26 -04:00
Leshana
ebebdbc37b Fix wall frames dropping steel and bugging on failure to place. 
Previously, if you tried to place a frame on a wall and it failed (due to something already being there etc)  you would no longer be asked what type to use next time you try, and it will runtime.
Fixes this by performing the safety checks *before* asking you want you want to build.  Since the checks don't depend on what type you want to build anyway its fine.
 2018-04-11 23:14:15 -04:00
Leshana
e6bc2fbe11 Fix building frames on walls and windows. 
try_build() has long accepted `user` parameter, but nothing that called try_build actually passed it!
Upgraded try_build on APC to use the user parameter, and switched to use to_chat while I was there.
 2018-04-11 23:13:54 -04:00
Leshana
54101f8dfd Switch frame construction menu to have a cancel button. 
Instead of having a whole frame type dedicated to giving a "Cancel" option... lets just tell BYOND to add a cancel button to the menu.
 2018-04-11 21:52:34 -04:00
Leshana
49e71b95a6 Fix wall frames dropping steel and bugging on failure to place. 
Previously, if you tried to place a frame on a wall and it failed (due to something already being there etc)  you would no longer be asked what type to use next time you try, and it will runtime.
Fixes this by performing the safety checks *before* asking you want you want to build.  Since the checks don't depend on what type you want to build anyway its fine.
 2018-04-11 21:52:33 -04:00
Leshana
c481f01343 Fix building frames on walls and windows. 
try_build() has long accepted `user` parameter, but nothing that called try_build actually passed it!
Upgraded try_build on APC to use the user parameter, and switched to use to_chat while I was there.
 2018-04-11 19:45:04 -04:00
Verkister
2dec2545e5 Adds giant rat voremob. 
-Currently only available via pred crate/shenanigans.
-This dude is friends with regular mice but will gladly kick any other ass.
 2018-04-11 20:44:53 +03:00
Verkister
fd8ccbedd9 Update flooring_premade.dm 2018-04-11 17:25:51 +03:00
Verkister
9f21628619 Adds deer taur. 
-Adds dual color deer taur.
-Sort of fits the lizardtaur saddlebag gear as well so I lazily made it accept the deer too for now.
 2018-04-11 17:14:21 +03:00
Verkister
08f840991d Fixes teal carpets. 
Unnecessary and unmarked vorestation edit. Our carpet_vr.dmi was exactly the same as polaris, but without the teal carpets, surprise!

Fixes #3381
 2018-04-11 14:08:40 +03:00