cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,660 Commits 5 Branches 0 Tags
6d60fb7cd6ed195e98e643a02554cdb87c626365
Commit Graph

25102 Commits

Author SHA1 Message Date
Neerti
6d60fb7cd6 Merge pull request #3276 from Anewbe/bloodloss_tweak 
Weakens bloodloss from burn damage
 2017-04-16 00:16:40 -04: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
Anewbe
e455aba104 Merge pull request #3254 from Anewbe/wallets 
Wallets can now hold permits.
 2017-04-15 18:43:17 -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
Anewbe
4a203c6559 Merge pull request #3304 from VOREStation/aro-pol-wingrille 
Make wingrille spawners usable
 2017-04-14 23:46:20 -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
Arokha Sieyes
c93836745f Make wingrille spawners usable 
Makes the spawner object itself block air and prevent active edges before the game starts, so you can actually use these in maps now without creating tons of active edge warnings and making ZAS zones merge everywhere. Should save a loooot of time for mappers picking those window directions.
 2017-04-14 21:35:49 -04:00
Anewbe
8142c8baa4 Merge pull request #3272 from LorenLuke/PDA-ID 
Can remove ID from PDA via Alt-Clicking now.
 2017-04-14 17:51:42 -05: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
cc64f0e537 Merge pull request #3255 from Anewbe/bartender_weapon_permit 
Gives the bartender a weapon permit in their spawned item list
 2017-04-14 01:04:19 -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
71caf7b360 Fixes SI helper proc 2017-04-13 21:22:51 -04:00
Yoshax
91e060621d Fixes scrubber Phoron scrubbing 2017-04-13 22:32:40 +01:00
LorenLuke
26c3653aec Changes most '<<' to 'to_chat()' 2017-04-13 12:46:04 -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
95aff3ae40 Tweaks the message given when a weapon dulls 2017-04-12 16:22:17 -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
920ad74e42 Merge pull request #3279 from Anewbe/borg_cuffs 
Should fix borg handcuffs
 2017-04-11 21:54:56 -04:00
Neerti
f24a252a8e Merge pull request #3281 from VOREStation/fix-scheduled-task-controller 
Fix null pointer runtime in scheduled task controller.
 2017-04-11 21:54:37 -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
Anewbe
fcc33c7816 Merge pull request #3282 from VOREStation/aro-pol-morenet 
Another e-net tweak
 2017-04-11 20:12:30 -05:00
Arokha Sieyes
7e69bafa53 Another e-net tweak 
Exploit where if you started breaking the net from the OUTSIDE, even if pulled away from you, you could break it. Adds a target to the do_after.
 2017-04-11 21:03:09 -04:00
Anewbe
be291a93c6 Merge pull request #3269 from VOREStation/port-process-scheduler 
Process deferral and profiling improvements
 2017-04-11 19:18:11 -05:00
Leshana
4f3029fcb2 Fix null pointer runtime in scheduled task controller. 
* If the "scheduler" controller is restarted by the process scheduler for
any reason, it will start throwing runtimes every status panel update
because the new replacement instance doesn't initialize its list of
schedule tasks.
* Fix that by copying over the unfinished list from the old instance, but
doing some safety checks to make sure it doesn't copy over bad stuff.
 2017-04-11 19:16:35 -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