cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 05:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,792 Commits 9 Branches 26 Tags
fc059ab4e8af1bfa97e0ea521ede9ee49672ddb8
Commit Graph

6957 Commits

Author SHA1 Message Date
Spades
fc059ab4e8 Merge pull request #397 from Cameron653/master 
Egg TF revamp, adds xeno egg sprite, bug fixes, reverts #382
 2016-07-03 20:10:34 -04:00
Arokha Sieyes
59f6b7570a Merge pull request #398 from VOREStation/sync 
Polaris Sync
 2016-07-03 19:47:47 -04:00
killer653
e55d5c6900 AHHHHHHHHHHHHH 2016-07-03 19:05:55 -04:00
killer653
88acd48f16 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
 2016-07-03 19:04:53 -04:00
killer653
4822804911 Fixes conflicts 2016-07-03 19:00:55 -04:00
Spades
bb8c14c69c Merge pull request #390 from VOREStation/meta-human 
Add human recoloring
 2016-07-03 18:54:39 -04:00
Arokha Sieyes
52b0bd25c4 Set respawn back to 60s 2016-07-03 18:15:15 -04:00
Arokha Sieyes
484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 
# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm
 2016-07-03 16:21:21 -04:00
killer653
3d35b13653 Brings back the floorlength braid. 2016-07-02 22:27:10 -04:00
Cameron653
13d75315bb Adds in selectable egg TF, reverts #382, a few tf fixes. 2016-07-02 20:52:07 -04:00
Spades
33c36365f6 Merge pull request #393 from Cameron653/master 
Gives monkeys default language, removes neatness tabs.
 2016-07-02 11:38:14 -04:00
Spades
e7e880a3f4 Merge pull request #387 from VOREStation/deathclaw 
Added Deathclaws.
 2016-07-02 11:37:56 -04:00
Cameron653
99a887f1db Gives monkeys the default language 
Also removes the tab spaces that were meant to make it look neater that
Github just said "no" to.
 2016-07-01 14:27:32 -04:00
Spades
821493fcdf Updated to include monkeys and corrections 
Now requires #385 before merging.
 2016-06-30 10:55:57 -04:00
Cameron653
002e768c79 Fixes combat robots not getting their modules. 2016-06-30 09:47:38 -04:00
Mechoid
d1eb23ee8b Allows Circuit-Brains (Digital) to be chosen as an FBP brain-type. (#2008) 
* Allows Circuit-Brains (Digital) to be chosen as an FBP brain-type.

* Fixes an Oops made with Status. (Thanks Zuh)
 2016-06-30 09:03:53 -04:00
killer653
7575cfef9e Adds the monkeys back 2016-06-30 02:14:36 -04:00
Spades
ea3f9c9aa2 Add human recoloring and clean up code 2016-06-29 20:37:02 -04:00
Datraen
ccda51ab68 Adds fluff antag factions, antag visibility options for uplinks. 
No mechanical changes come of this change, only the ability to have an antagonist faction, as well as having specified visbility for the affiliation itself.
Also adds Skrell home system to the home system list.
 2016-06-29 11:25:52 -04:00
killer653
90b609c291 Fixes #386 2016-06-29 02:40:01 -04:00
Spades
0c00bd5c59 Added Deathclaws. 2016-06-28 23:30:27 -04:00
Anewbe
72a5e8316f Attacks break stealth 2016-06-26 23:31:01 -05:00
Anewbe
895740368a Drones no longer boom on z-level change 2016-06-26 15:22:50 -05:00
Yoshax
53d67ee8af Ports Snowy stuff from Eros 2016-06-24 14:35:17 +01:00
killer653
750958945c Small tweak 2016-06-20 15:14:07 -04:00
HarpyEagle
f0c8e0e516 Makes smaller mobs have smaller organs 2016-06-20 00:26:44 +01:00
Yoshax
cf76d6dac4 Fix stuff 2016-06-20 00:18:34 +01:00
HarpyEagle
8a2135c917 Replaces macro with span 2016-06-20 00:10:41 +01:00
HarpyEagle
78cd94b113 Fixes #12877 2016-06-20 00:10:25 +01:00
HarpyEagle
0f864e1390 Limits distance that mobs can be thrown based on relative size 2016-06-20 00:09:47 +01:00
HarpyEagle
8fc62cdbbc Small mobs can no longer pin larger mobs 2016-06-20 00:09:37 +01:00
HarpyEagle
69dd0bb5d0 Makes it easier to break free of a grab by a smaller mob 2016-06-20 00:09:28 +01:00
HarpyEagle
6599f64b10 Stripping no longer uses requests, removes it from mob code 2016-06-20 00:09:00 +01:00
HarpyEagle
0ba2aef187 Fixes jointlock not accounting for species with less health or NO_PAIN 2016-06-20 00:08:51 +01:00
HarpyEagle
fd3a3175ae Moving while unable to move and grabbed acts as a shortcut for resist 2016-06-20 00:08:36 +01:00
HarpyEagle
b410d43eb5 Adjusts attack_joint() so that disarm attacking is actually useful 
If disarm attacking deals half damage but is expected to deal half
the damage to the limb before dislocating it, it's not any more useful
than just breaking their limbs, other than the fact that you do less damage
 2016-06-20 00:06:21 +01:00
HarpyEagle
6ecf6bc154 Cleans up stance handling. 
Now that dislocation no longer implicates !is_usable(), we can tidy up stance_damage calculation.
Also fixes stance being processed every tick except for the fourth, instead of the inverse
 2016-06-19 23:58:44 +01:00
HarpyEagle
36e53d4b98 Fixes disarm-attacking being very likely to break the limb before dislocating it. 
Also makes it possible to 'strike to cripple' with stunbatons
 2016-06-19 23:58:16 +01:00
HarpyEagle
fcb8c63d2a Fixes organs listed under organ tag instead of organ name when using undislocate verb 2016-06-19 23:54:35 +01:00
HarpyEagle
9976291ca4 Refactors dislocation, clearer distinction between is_dislocated() and is_usable() 
Dislocation no longer relies on adjusting dislocated state of children.
Fixes dislocating and relocating parent organs magically fixing children or protecting children from being dislocated.
Dislocated limbs no longer count as unusable, since they already count for stance damage and dropping items anyways.
In addition, dislocated limbs add to traumatic_shock
Also corrects a misusage of traumatic_shock
 2016-06-19 23:54:22 +01:00
Cameron653
8ab0af947e Update station_vr.dm 2016-06-18 17:32:50 -04:00
Cameron653
cbd9abf37c Update station_vr.dm 2016-06-18 17:31:35 -04:00
Richard D'angelo
2de751a8ee Readded the click Catcher 
To avoid losing the click catcher on the reloging

there we go, proper credits to
https://github.com/PsiOmegaDelta
 2016-06-18 16:39:21 -03:00
Cameron653
9b4c967b23 Fixes! 2016-06-18 14:50:47 -04:00
Richard D'angelo
7ab5220f64 510 Improved Overlays 
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.

I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.

Ported from:

7c2cc890ab
 2016-06-18 15:50:10 -03:00
mwerezak
d6a7d4ed04 Fixes resisting out of grabs when weakened 2016-06-17 19:28:34 +01:00
Cameron653
61d4aeced1 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-06-15 14:30:40 -04:00
Arokha Sieyes
c15c4da829 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2016-06-14 16:48:00 -04:00
Yoshax
2adf53d265 Merge pull request #1939 from VOREStation/emotestop 
Prevent lobby players from seeing emotes
 2016-06-14 21:46:36 +01:00
Arokha Sieyes
cecd4c7a61 Prevent lobby players from seeing emotes 
Someone had already added a 'return-only' override for hear_say for new_player mobs to keep their ghostears from working in the lobby, however ghostsight/eyes/whateveritscalled has not worked as it should and it seems like nobody thought to add a show_message block for emotes.
 2016-06-14 16:08:53 -04:00