cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 19:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,679 Commits 8 Branches 26 Tags
e156339dbd44bbf2381ca4f41cfd1519ca43436f
Commit Graph

16648 Commits

Author SHA1 Message Date
Leshana
e156339dbd Working theory 2017-04-15 23:15:19 -05:00
Leshana
7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
 2017-04-15 23:14:32 -05:00
Anewbe
1fbef2de5b Merge pull request #3286 from VOREStation/smooth-lighting 
Port tg/paradise/goon soft-edge lighting
 2017-04-15 22:52:42 -05:00
Leshana
a29b807953 Allow set_opacity() to work for turfs too. 
Fixes lighting opacity not updating on mined rock walls and false doors.
 2017-04-15 10:37:35 -05:00
Anewbe
91bec124b8 Merge pull request #3292 from Neerti/4/13/2017_shields 
Changes Shields
 2017-04-14 23:47:23 -05:00
Neerti
953574a57d Merge pull request #3303 from Anewbe/doona_faces 
Diona should regrow faces now
 2017-04-15 00:21:33 -04:00
Screemonster
e17449dd28 adds horse, cow, fantail and wagtail tails, and colorable antennae "ears" 2017-04-14 19:02:34 +01:00
Neerti
d9bd49aae4 Aiming at someone is now logged 2017-04-14 03:40:03 -04:00
Neerti
e5fd28818d Merge pull request #3299 from Anewbe/grabfix 
Should fix throwing people.
 2017-04-14 01:10:23 -04:00
Neerti
e4bd163331 Merge pull request #3265 from Anewbe/skrellian_voidsuit 
Rebalances some alien space suits
 2017-04-14 01:03:33 -04:00
Neerti
55fbf0b84b Merge pull request #3288 from Anewbe/hard_hat 
Hardhat tweaks
 2017-04-14 01:02:40 -04:00
Neerti
770f3d4ab5 Merge pull request #3290 from Anewbe/antag_infections 
Ling and Technomancer now have ways to cure infections
 2017-04-14 01:02:11 -04:00
Anewbe
4cf38d9037 Should fix throwing people. 2017-04-13 23:38:16 -05:00
Anewbe
25ea0ed33d Diona should regrow faces now 2017-04-13 22:48:10 -05:00
LorenLuke
452f1fad9b Merge branch 'master' into Grab-Throw-Fix 2017-04-13 19:29:40 -07:00
LorenLuke
a0eecc9f45 Fixes grabs not being able to throw (sorry... :c ) 2017-04-13 19:28:10 -07:00
Neerti
c84ab67fd3 Changes Shields 
See PR for details
 2017-04-13 00:36:13 -04:00
Leshana
d00c2596e8 Restores "soft" darksight vision. 
The previous client-side optimization made lighting overlays go fully
opaque when it was dark, making it so species darksight didn't let you see
anything.  This fixes that by making a dark_soft icon state that has
opacity matching the LIGHTING_SOFT_THRESHOLD.
 2017-04-12 21:43:07 -04:00
Anewbe
d1657e23c2 Ling and Technomancer now have ways to cure infections 2017-04-12 19:15:32 -05:00
Leshana
5f629e2aca Optimizes lighting overlays for slow clients. 
Ports https://github.com/tgstation/tgstation/pull/25778 and https://github.com/tgstation/tgstation/pull/25861
* Instead of using color matrix for all overlays, fully dark and fully light use static black and transparant icon states without color matrix.
* Also implements LIGHTING_ROUND_VALUE so that lighting values actually will reach 0 or 1.
 2017-04-12 19:12:06 -04:00
Leshana
f2956464b8 Replace direct access of lighting overlays with T.get_lumcount() 2017-04-12 19:11:53 -04:00
Leshana
e8af4afc88 Port tg/paradise/good soft-edge lighting 
Ports https://github.com/ParadiseSS13/Paradise/pull/6161
Its merged in nearly verbatim as far as the lighting module goes.
Changes outside the lighting module are merged based on our codebase.
 2017-04-12 19:11:45 -04:00
Neerti
88e38117d9 Merge pull request #3016 from Anewbe/weapon_dulling 
Material Weapon rework
 2017-04-12 18:08:04 -04:00
Anewbe
077fa19920 Merge pull request #3285 from Anewbe/aviator_fix 
Fixes aviator SecHUDS
 2017-04-12 16:52:46 -05:00
Anewbe
771063f7a7 Merge pull request #3270 from SinTwo/tablefix 
Table Fix
 2017-04-12 16:40:54 -05:00
Anewbe
21d833746d Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling 2017-04-12 16:10:58 -05:00
Cerebulon
18de8caf6a Adds two side swept versions of the Undercut haircut 
Also removes a couple of unnecessary comments from the file.
 2017-04-12 21:13:59 +01:00
Anewbe
746e98a012 Hardhat tweaks 2017-04-11 23:09:43 -05:00
Leshana
45058136e2 Replace opacity = X with set_opacity(X) so that the lighting system can update propertly. 2017-04-11 22:36:48 -04:00
Anewbe
60fa2839e7 Fixes aviator SecHUDS 2017-04-11 21:20:48 -05:00
Neerti
75cc189723 Merge pull request #3271 from VOREStation/aro-pol-panic 
Quick & Dirty Panic Bunker Port
 2017-04-11 21:55:59 -04:00
Neerti
ac12cfc33f Merge pull request #3283 from Anewbe/ninja_drugs 
Ninja rig has different chems
 2017-04-11 21:52:58 -04:00
Neerti
d0d19af7c5 Merge pull request #3284 from Anewbe/brainloss 
Lessens brainloss from oxyloss
 2017-04-11 21:52:27 -04:00
Anewbe
56292c6c5f Merge pull request #3260 from VOREStation/aro-pol-spawnverb 
Fix 'Spawn Character' DNA
 2017-04-11 20:50:45 -05:00
Anewbe
03c0ebf490 Lessens brainloss from oxyloss 2017-04-11 20:42:17 -05:00
Anewbe
4085e28285 Ninja rig has different chems 2017-04-11 20:34:11 -05:00
Arokha Sieyes
ebb2bf9675 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync2 2017-04-11 21:29:07 -04:00
Anewbe
2c1a748650 Merge pull request #3274 from LorenLuke/Grabs 
Resisting out of choking grabs isn't 100% guaranteed anymore.
 2017-04-11 18:11:11 -05:00
ArbyTheDragon
82005ff9c1 Tending to OCD by capitalizing 'carthatoline' 
Pow. It's gonna be changed.
 2017-04-11 15:22:53 -05:00
Arokha Sieyes
b7618caae9 Merge pull request #1384 from VOREStation/aro-wetfish 
Allows Akula to breathe underwater
 2017-04-11 16:17:04 -04:00
LorenLuke
faf85774b5 Resisting out of choking grabs isn't 100% guaranteed anymore. Tweaked some ling checks to compensate. 2017-04-11 01:16:03 -07:00
Arokha Sieyes
0e447f6f2c Allows Akula to breathe underwater 
SHERKS. Sherk sherk. Sherk in a sherk splash. Sherk splash in a sherk pool.
 2017-04-11 00:50:51 -04:00
Arokha Sieyes
42998da918 Fix 'if' statement on Panic Bunker 
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
 2017-04-11 00:13:54 -04:00
Arokha Sieyes
66327aecc7 Quick & Dirty Panic Bunker Port 
Tested on our server, works. Doesn't work if you don't have a DB (how would it?).
 2017-04-11 00:13:43 -04:00
Arokha Sieyes
ba1221889c Fix 'if' statement on Panic Bunker 
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
 2017-04-11 00:12:32 -04:00
SinTwo
afb6f1b572 Fixes: #3268 2017-04-10 23:32:38 -04:00
Arokha Sieyes
b3d652fa50 Quick & Dirty Panic Bunker Port 
Should work! Should.
 2017-04-10 22:38:58 -04:00
Arokha Sieyes
dc22050140 Loadout path fix 2017-04-10 20:55:24 -04:00
Arokha Sieyes
e7d8af7ae7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml
 2017-04-10 20:41:18 -04:00
Arokha Sieyes
49f0661d36 Merge pull request #1377 from VOREStation/aro-doafter 
Prevent ranged dogborg noms
 2017-04-10 20:31:04 -04:00