cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 21:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,631 Commits 9 Branches 26 Tags
1d32ab92f0daf8ed294cdfd3b45e6fca84c59e7b
Commit Graph

8904 Commits

Author SHA1 Message Date
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
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
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
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
BillyBangles
f5dfbff1bd Build igloos and snowmen (#4811) 
* adds packed snow brick material

* makes snow walls spawnable for mapping

* adds snowmen

craft them with snow. duh.

* snow spider triggers arachnophobia

also changelog.
 2018-02-15 14:25:51 -06:00
Anewbe
7e2df51283 Changes mine code, adds random mine spawners (#4817) 2018-02-15 12:19:58 -08:00
Arokha Sieyes
58d62f3b69 Corrects SA projectile damage accidental removal 
Now it just adjusts the Proj's damage instead of doing brute damage directly, so it can be affected by armor and whatever complex things living/bullet_act checks.
 2018-02-15 04:04:20 -06:00
Arokha Sieyes
edd24126aa Fixes lack of borg fullbright with mesons etc 2018-02-15 03:10:04 -06:00
Arokha Sieyes
90446ec502 Fixes #3028 2018-02-15 02:37:15 -06:00
Arokha Sieyes
ba8c2a3447 Travis awk workaround for list comments 2018-02-15 02:31:05 -06:00
Arokha Sieyes
e248b89b7b POLARIS: Player-controlled SA QOL 2018-02-15 01:49:53 -06:00
Arokha Sieyes
e336d0c255 POLARIS: Allow Simple Animals to have armor in a normal sensible way 2018-02-15 01:36:13 -06:00
Arokha Sieyes
49a750a9a9 POLARIS: Don't require hostile SAs for special purposes 2018-02-15 01:28:21 -06:00
Arokha Sieyes
05aa8540ca POLARIS: Extend mob 'glow' capabilities 
Now you can alter the other set_light variables by setting them on the mob (yay antiphoton effects that follow you)
 2018-02-15 01:24:42 -06:00
Arokha Sieyes
26fea6a875 POLARIS: Fix the seedarkness variable 
Now essentially works as a "permanent darksight adjustment" variable, removing the slow change.
 2018-02-15 01:23:37 -06:00
Arokha Sieyes
a66f8438d1 POLARIS: Attacktext change 2018-02-15 01:18:33 -06:00
Arokha Sieyes
02e490af7a VS: Implement shadekin as a legit big deal 2018-02-15 01:15:24 -06:00
Arokha Sieyes
489603d814 POLARIS: Allow Simple Animals to have armor in a normal sensible way 2018-02-15 01:15:23 -06:00
Arokha Sieyes
0afe576633 POLARIS: Don't require hostile=1 on silly things 
Like cats, just to get them to hunt mice.
 2018-02-15 01:15:23 -06:00
Arokha Sieyes
be4ab0abfd VS: Attacktext List Changes 2018-02-15 01:15:23 -06:00
Arokha Sieyes
57bc484fc1 POLARIS: Extend mob 'glow' capabilities 
Now you can alter the other set_light variables by setting them on the mob (yay antiphoton effects that follow you)
 2018-02-15 01:15:22 -06:00
Arokha Sieyes
ae0c95b319 POLARIS: Fix the seedarkness variable 
Now essentially works as a "permanent darksight adjustment" variable, removing the slow change.
 2018-02-15 01:15:22 -06:00
Arokha Sieyes
5c08ee7a2a POLARIS: Simple Animal Player QOL 
Adds a HUD when controlling a simple animal. Allows intents, mostly harm and help if they don't have hands. Disarm and grab if they do. Gives them a generic hud, and adds a var to decide if they have hands or not. Adds a var printed to any client that joins into a mob to explain how to play them, or lore stuff, or whatever you feel like.
 2018-02-15 01:15:22 -06:00
Arokha Sieyes
8965acf209 POLARIS: SA attacktext list 
Now you can use a list for the attack verb on simple animals, for VARIETY
 2018-02-14 22:35:33 -06:00
Arokha Sieyes
b61723aa3b POLARIS: Attack icons for things 
Uses the in-hand item when attacking to draw the icon, or for anything else (simple animals, etc) you can specify an icon to use (all SA default to a 'slashing' animation)
 2018-02-14 21:59:42 -06:00
Screemonster
c9f5d6f234 squashed commits for improved newspapering 2018-02-13 17:53:02 +00:00
Anewbe
51d425b1b8 THE MINI FIST-PUNCH UPDATE (#4804) 
* VARIOUS FISTICUFFS RELATED CODE CHANGES
 2018-02-12 23:17:35 -08:00
Anewbe
534a588a6a Gun changes (#4185) 
* Various background gun changes

* Forgot to include the sounds, woops

* Fixes some more gun stuff

* Makes the cham gun work again
 2018-02-12 23:12:14 -08:00
Aronai Sieyes
3902093a31 Merge pull request #2991 from Haery70/master 
Haery70 - adds Cookiegirl mobs
 2018-02-11 14:53:20 -06:00
Verkister
660e359708 Fixes pAI HUDs not working at all. 
-For some whatever reason the things had absolutely no function other than toggling a single pAI specific var that had no code whatsoever connected to it.
 2018-02-11 12:03:51 +02:00
Anewbe
377ca0fe3f Merge pull request #4798 from Anewbe/folder_rename 
Removes a stray space, replaces it with glorious underscore
 2018-02-11 02:05:45 -06:00
Anewbe
b2bbe63e83 Merge pull request #4789 from VOREStation/vplk-ghosts-invisible 
Make ghosts invisible again.
 2018-02-11 01:53:59 -06:00
Anewbe
9688dcb6be Removes a stray space, replaces it with glorious underscore 2018-02-11 01:47:20 -06:00
Anewbe
2eac03ec08 Adjusts certain simple mobs, adds some things (#4778) 2018-02-10 23:31:03 -08:00
Cameron653
e128afbd17 Fixes Typing Indicator (#4773) 
* Fixes text indicator. Works on getting the chat bar to work.

* Getting the text bar to show the typing indicator proved to be impossible.

Seeing as it was cut out 3 years ago for being absolutely broke, I snipped it out of the code.

* Makes the indicator work better
 2018-02-10 18:16:17 -06:00