cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,723 Commits 8 Branches 26 Tags
db62300a17c3dc4b1470f45434bb3ed1d72091b6
Commit Graph

19886 Commits

Author SHA1 Message Date
Aronai Sieyes
db62300a17 Merge pull request #3078 from Screemonster/moremeramods 
Adds "monster tamer" drink, plus some chimera tweaks.
 2018-02-22 13:15:40 -05:00
Aronai Sieyes
6fc64be1a8 Merge pull request #3091 from VOREStation/Cameron653-patch-1 
Adds a toggle to the bluespace jumpsuit
 2018-02-22 12:33:16 -05:00
Aronai Sieyes
4917222a6b Merge pull request #3086 from Verkister/backgrounds 
Preview background fixes and additions.
 2018-02-21 17:17:50 -05:00
Cameron653
f15195cded Whoops 2018-02-21 16:50:26 -05:00
Cameron653
031c30d06d Adds a toggle to the bluespace jumpsuit 2018-02-21 16:43:57 -05:00
Cyantime
c1cdbacfe4 Corrects inkling color blend mode 2018-02-20 18:23:12 -05:00
Screemonster
67c8d706dc more sanity checks and sensible syntax 2018-02-20 23:22:04 +00:00
Screemonster
421aa33c40 Gets rid of the sleep() altogether and also that client rotation thing that breaks everything 2018-02-20 10:15:17 +00:00
Verkister
1bcbcc926d Preview background fixes and additions. 
-Fixes flat white background capitalization error.
-Re-enables tunnel plating and reinforced floor.
-Adds darker plating, ribbed techmaint tiles, and flat middle grey.
-Tweaks their cycle order to cycle flats by shade, and then tiles by shade.
-Moves our update preview code underneath the polaris original.
-Polaris bg list update waiting for merge out there as well, but let me know anyway if I should do a temporary vorestation edit comment until next sync tho.
 2018-02-20 09:52:56 +02:00
Arokha Sieyes
f47ae8e03c VS: Fix a destroy by creating a subsystem 2018-02-20 00:23:37 -05:00
Arokha Sieyes
e3215c98e1 VS: Fix serveral Destroy()s, VS edition 2018-02-20 00:21:29 -05:00
Arokha Sieyes
a75cfe0eb1 POLARIS: Fix several Destroy()s 2018-02-20 00:20:46 -05:00
Aronai Sieyes
fe38f572c9 Merge pull request #3081 from VOREStation/aro-kinnomf 
Allow shadekin phase-shift noms
 2018-02-19 23:48:36 -05:00
Arokha Sieyes
736d5a9531 Allow shadekin phase-shift noms 
Allows shadekin to phase in on people, and if they are set to be a dropnom pred in the vore panel, they'll belly the person they land on.
 2018-02-19 17:45:26 -05:00
Aronai Sieyes
8e40126064 Merge pull request #3076 from VOREStation/vplk-tesla-grounding 
Tweak Tesla Grounding Rods
 2018-02-19 17:08:58 -05:00
Aronai Sieyes
ebe489d01d Merge pull request #3071 from VOREStation/vplk-gas-turbine 
Make gas turbine constructable and operational
 2018-02-19 17:08:16 -05:00
Screemonster
6769c04a44 I think I've spotted that fucking bug that was plaguing me. 2018-02-19 14:30:28 +00:00
Screemonster
635bbb7a73 Adds "monster tamer". 2018-02-19 14:03:34 +00:00
Leshana
7688115552 Tweak Tesla Grounding Rods 
Grounding rods that are anchored can be struck two turfs farther away than unanchored.  This makes it possible to leapfrog towards a tesla because an unanchored one can be protected in the "shadow" of the anchored one.
 2018-02-19 03:41:45 -05:00
Arokha Sieyes
309082a089 Shadekin added invisibility 2018-02-18 23:06:15 -05:00
Arokha Sieyes
478016793c Shadekin set realname when shifting 
Only humans do automatically, it seems. Not an issue for admins, but later it might be.
 2018-02-18 21:29:27 -05: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
Aronai Sieyes
ee022c1f79 Merge pull request #3063 from VOREStation/aro-boxes 
Boxes + Air Pumps + Intercoms
 2018-02-18 20:35:07 -05:00
Arokha Sieyes
eb78b87458 Add orange/green shadekin 2018-02-18 20:05:44 -05:00
Arokha Sieyes
33539aa0f4 POLARIS: Ports Bay oxygen/anesthetic pumps 2018-02-18 13:14:57 -06:00
Arokha Sieyes
cabe2676e9 POLARIS: Moves most boxes to use starts_with 2018-02-18 13:03:05 -06:00
Aronai Sieyes
c36d01939c Merge pull request #3061 from VOREStation/aro-sync 
Smol Sync
 2018-02-18 00:56:41 -06:00
Arokha Sieyes
9d9d735b99 Remove misplaced debug statement 2018-02-18 00:44:02 -06:00
Aronai Sieyes
9fe14358a7 Merge pull request #3060 from VOREStation/aro-sklang 
Gives shadekin a (private, unlearnable) language
 2018-02-18 00:35:12 -06:00
Aronai Sieyes
5c22da4cc0 Merge pull request #3059 from Mewchild/ringfix 
Ringfix v2
 2018-02-18 00:33:09 -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
4d9eacbd75 Adds mars 2018-02-18 00:22:43 -06:00
Leshana
f34a0f104e Revert adding unnecessary proc and fixing paths for vietsi custom item. 2018-02-18 00:47:10 -05: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
4feee9a8ab Gives shadekin a (private, unlearnable) language 2018-02-17 23:39:21 -06:00
Arokha Sieyes
55ba550409 More optimizations for character joins 2018-02-17 23:24:11 -06:00
Mewchild
6af91caf6b Ringfix v2 2018-02-17 23:02:41 -06:00
Aronai Sieyes
a979d3e586 Merge pull request #3057 from VOREStation/aro-listshort 
Make turf obfuscation lists lazy
 2018-02-17 22:44:13 -06:00
Anewbe
09f7f798d3 Power monitoring consoles find all station-related sensors (#4853) 2018-02-17 20:40:32 -08:00
elgeonmb
c359d8aae4 unions no longer make firearms (#4836) 2018-02-17 20:40:15 -08:00
Arokha Sieyes
d12860aef8 Make turf obfuscation lists lazy 2018-02-17 21:55:59 -06:00
Leshana
0806ca868b Fix same-size mobs walking on each other and being unable to bump doors. 
* handle_micro_bump_helping was unconditionally returning TRUE, overriding normal bump behavior.  Fixed to only return TRUE when its size conditions are met.
* As a side effect of that bug, now_pushing was not being set back to zero.  Fixing the prior bug solved that, but as an extra precaution, moved now_pushing = 0 out of the proc so it will get set back no matter what.
 2018-02-17 22:44:12 -05:00
Arokha Sieyes
0dd7a2e2e3 Initial cleanup/changes 2018-02-17 19:47:39 -06:00
Arokha Sieyes
1d32ab92f0 Clean up some recent update_icons() changes 2018-02-17 19:06:02 -05:00
Leshana
ef3df27528 VOREStation Specific Merge Changes 
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
 2018-02-17 16:56:31 -05:00
Leshana
5edfc7516b Adjust VOREStation guns for PolarisSS13/Polaris/#4185 2018-02-17 16:56:30 -05: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
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