cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 22:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,729 Commits 8 Branches 26 Tags
c99bf87547fe95e4eeec1f0e7bb9afa761b4eb24
Commit Graph

8935 Commits

Author SHA1 Message Date
Aronai Sieyes
2315541c22 Merge pull request #3096 from VOREStation/aro-imagecleanup 
Improve two image cleanups
 2018-02-22 19:35:42 -05:00
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
Arokha Sieyes
d9dc7c557d Improve two image cleanups 2018-02-21 23:23:02 -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
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
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
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
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
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
Arokha Sieyes
eb78b87458 Add orange/green shadekin 2018-02-18 20:05:44 -05:00
Aronai Sieyes
c36d01939c Merge pull request #3061 from VOREStation/aro-sync 
Smol Sync
 2018-02-18 00:56:41 -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
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
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
Aronai Sieyes
a979d3e586 Merge pull request #3057 from VOREStation/aro-listshort 
Make turf obfuscation lists lazy
 2018-02-17 22:44:13 -06: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
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
Arokha Sieyes
dec6941fea Fix for borgs accidentally getting into useless grab/disarm intents 2018-02-16 22:46:43 -06:00
Aronai Sieyes
6d0aba7f4a Merge branch 'master' into aro-puppers 2018-02-16 19:33:52 -06:00
Aronai Sieyes
49e945afb7 Merge pull request #3023 from Screemonster/stopkillingthedamncat 
Adds newspapering, fixes mob digestion toggle, and other tweaks
 2018-02-16 19:33:20 -06:00
Arokha Sieyes
f4d0ec3fb8 Port Bay's survival boxes 
Includes some tweaks to items that usually come in the boxes to make them more similar to the Bay implementation.
 2018-02-16 19:21:15 -06:00
Anewbe
004ff0166d Merge pull request #4822 from VOREStation/pol-sa-playerqol 
Player-controlled SA QoL
 2018-02-16 12:52:14 -06:00
Anewbe
b8058d5cc7 Merge pull request #4825 from VOREStation/pol-mob-glow 
Extend mob 'glow' capabilities
 2018-02-16 12:50:54 -06:00
Anewbe
897833b0fc Merge pull request #4848 from VOREStation/pol-shoes 
Walking with nonshoes on feet causes runtimes
 2018-02-16 12:50:28 -06:00
Cyantime
b0b821cb71 Adds hidden alarms, for air alarms, fire alarms, and APCs (#4816) 
* Adds hidden alarms

* TRUE/FALSE defines

* Renames var to alarms_hidden
 2018-02-16 12:50:06 -06:00
Aronai Sieyes
78d7ef1d72 Port Bay-style attack animations (#4827) 
* POLARIS: Attack animations

* POLARIS: Overlay flick system

You can't do this in Byond, unfortunately, so here's some code from /tg/

* Make attack anims a preference
 2018-02-15 22:02:04 -06:00
Aronai Sieyes
15a5e5e10b Merge branch 'master' into pol-sa-playerqol 2018-02-15 21:56:53 -06:00
Arokha Sieyes
6b0b76b78a POLARIS: Walking with nonshoes on feet causes runtimes 2018-02-15 21:45:40 -06:00
Arokha Sieyes
f3acd961d3 POLARIS: Walking with nonshoes on feet causes runtimes 2018-02-15 21:44:59 -06:00
Anewbe
5a309f1aa1 Merge pull request #4826 from VOREStation/pol-sa-hostile 
Don't require hostile SAs for special purposes
 2018-02-15 21:07:40 -06:00
Anewbe
4be61a3485 Merge pull request #4828 from VOREStation/pol-sa-armor 
Allow Simple Animals to have armor in a normal sensible way
 2018-02-15 21:02:14 -06:00
Anewbe
6fd448a3ad Merge pull request #4821 from VOREStation/pol-sa-attacktext 
Allow simple_animal to have more than one attack verb
 2018-02-15 20:55:41 -06:00
Anewbe
cd0394c88b Merge pull request #4834 from VOREStation/pol-borgbright 
Fixes lack of borg fullbright with mesons etc
 2018-02-15 19:12:33 -06:00
Anewbe
0360116ac5 Merge pull request #4823 from VOREStation/pol-sa-seedarkness 
Fix the seedarkness variable
 2018-02-15 19:12:08 -06:00
Arokha Sieyes
a88dfd0d20 Make attack anims a preference 2018-02-15 17:44:21 -06:00