cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,056 Commits 9 Branches 0 Tags
9dfc65b6280704d2e23a0e38cda9925a459649c0
Commit Graph

15691 Commits

Author SHA1 Message Date
Anewbe
46d447e478 Merge pull request #3326 from Cerebulon/techoriginsfix 
Fixes improperly formatted tech_origins
 2017-04-17 20:57:28 -05:00
Anewbe
b00897fb15 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scratch_damage 2017-04-17 16:49:10 -05:00
Anewbe
8d8eaaa1b1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into thermals 2017-04-17 16:46:10 -05:00
Cerebulon
843a59ca07 Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife. 2017-04-17 19:31:01 +01:00
Anewbe
b7751bab10 Changelog, adds the dicecup to the loadout 2017-04-17 12:44:34 -05:00
LorenLuke
c28d8738aa Silenced Weapons tell firer when fired. 2017-04-17 10:34:40 -07:00
Anewbe
35d4f2455d Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dice_thing 2017-04-17 12:27:36 -05:00
Anewbe
ed66150523 Tweaks hallucinations from the supermatter 2017-04-17 12:19:35 -05:00
Leshana
ff3c5238aa De-snowflake thrown objects hitting turfs. 
* Port of https://github.com/Baystation12/Baystation12/pull/16942
* Actually tell turfs when a thrown object hits them, and let them decide what to do about it!
  * We do this by calling hitby(), which is how it already works for obj and mob, so this makes behavior consistent.
* This allows us to cleanly solve the problem of a thrown object landing on open space without falling.
 2017-04-17 13:13:40 -04:00
Leshana
b5dbe8492c Fix crash in turbolifts built on any z-level other than "1" 
Port of https://github.com/Baystation12/Baystation12/pull/16941
* Turbolift auto-mapping code assumed that all lift's first floor would be on z=1.  Fixed so it picks the first floor instead of the zth floor from the floor list.
 2017-04-17 13:13:39 -04:00
MagmaRam
cff6fc4150 Merge pull request #3313 from Anewbe/halt_fix 
Sorta fixes the syntax on the *halt emote
 2017-04-17 11:26:46 -05:00
Leshana
95b9dde94a Multi-Z code formatting and utilities. 
* Global procs should start with /proc
* Use to_chat() macro
* Added utility to find all z-levels are connected (transitively adjacent) and utility to test if two levels are connected.
 2017-04-17 11:57:49 -04:00
PsiOmegaDelta
663e2b2d4c Can no longer move up/down from non-turf locations. 
Port of https://github.com/Baystation12/Baystation12/pull/16653/
 2017-04-16 21:33:16 -04:00
Leshana
b9dd5233a6 Fix mining turfs permenently unlit. 
* Mining turfs generated during random mapgen get their opacity changed
without a call to recalc_atom_opacity() becuase the game ticker has not
started.  Make sure we call it even before that point.
 2017-04-16 14:46:09 -04:00
Neerti
d09cc7a57d Merge pull request #3306 from Anewbe/markings 
Makes two more markings Taj only
 2017-04-16 10:26:16 -04:00
Neerti
22c329e906 Merge pull request #3305 from VOREStation/aro-pol-planets 
Make planets more generic
 2017-04-16 01:30:55 -04:00
Neerti
c91d8cc767 Merge pull request #3273 from LorenLuke/Numpad 
Allows usage of ctrl+numpad for target zone selecting.
 2017-04-16 00:40:15 -04:00
Anewbe
fd070196dd Adds the Liar's Dice game 2017-04-15 23:28:15 -05:00
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
f4444f2dad Sorta fixes the syntax on the *halt emote 2017-04-15 20:35:17 -05:00
LorenLuke
7505061f4a Fixes ventcrawling for spiderbots/implants/etc. 2017-04-15 13:59:54 -07: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
LorenLuke
ca378b7b69 Tweaks Changeling Respecs. 2017-04-15 01:57:49 -07:00
Anewbe
91bec124b8 Merge pull request #3292 from Neerti/4/13/2017_shields 
Changes Shields
 2017-04-14 23:47:23 -05:00
Anewbe
29eb4f5425 Makes two more markings Taj only 2017-04-14 23:25:46 -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
aaeae6695a Make planets more generic 
So that Sif doesn't have to be the only one!
 2017-04-14 21:36:48 -04:00
Neerti
5b4ab95bd5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/14/2017_makeshift_armor 2017-04-14 03:54:23 -04: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
Anewbe
2e3bd1f6d9 Adds a lever-action rifle 2017-04-13 15:36:37 -05:00
Anewbe
fd9b3acaef Fixes the carp lag issue 2017-04-13 14:11:10 -05: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