cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-25 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,866 Commits 9 Branches 0 Tags
30454ccdc3780e8b2c0ae09c8eaeb327de2ee659
Commit Graph

8973 Commits

Author SHA1 Message Date
Leshana
30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-02-23 21:55:42 -05:00
Leshana
4457c2ffd2 Merge pull request #3111 from VOREStation/aro-say2 
say() safety check on client
 2018-02-23 18:06:59 -05:00
Arokha Sieyes
fc3aca384a say() safety check on client 
Spawn keeps it from destroying all say(), thankfully, but needs to be fixed.
 2018-02-23 15:56:16 -05:00
Anewbe
b58b4fcfde Merge pull request #4928 from VOREStation/pol-join-order 
Create humans ON their spawn points
 2018-02-23 13:18:28 -06:00
Arokha Sieyes
ef18bc7ff1 POLARIS: Allow alteration of mob default see_invisible 2018-02-22 23:01:16 -05:00
Atermonera
7f12366cc8 Merge pull request #4862 from Anewbe/steals_more_armor 
Adds/steals more armor code, inventory changes
 2018-02-22 18:55:01 -08:00
Anewbe
0c75b3e634 Merge pull request #4916 from VOREStation/pol-hudfix 
Critters Can Crawl Carrying Client Constructs
 2018-02-22 19:19:28 -06:00
Arokha Sieyes
1720cd54f3 Create humans ON their spawn points 
Instead of moving them there later.
 2018-02-22 20:14:39 -05:00
Aronai Sieyes
2315541c22 Merge pull request #3096 from VOREStation/aro-imagecleanup 
Improve two image cleanups
 2018-02-22 19:35:42 -05:00
Aronai Sieyes
db62300a17 Merge pull request #3078 from Screemonster/moremeramods 
Adds "monster tamer" drink, plus some chimera tweaks.
 2018-02-22 13:15:40 -05:00
Anewbe
8c5dc66a13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-21 23:33:17 -06:00
Anewbe
fa9f55d944 Merge pull request #4912 from Verkister/patch-5 
Small regenerate_icons tweak.
 2018-02-21 23:07:23 -06:00
Arokha Sieyes
d9dc7c557d Improve two image cleanups 2018-02-21 23:23:02 -05:00
Arokha Sieyes
6da9eb5451 Fix HUD creation and ventcrawling 2018-02-21 17:47:19 -05:00
Aronai Sieyes
4917222a6b Merge pull request #3086 from Verkister/backgrounds 
Preview background fixes and additions.
 2018-02-21 17:17:50 -05:00
Anewbe
21592606b7 Merge pull request #4898 from Mechoid/Mining_Optimization 
Mining Bag / Box Speedification
 2018-02-21 16:15:16 -06:00
Anewbe
a6653bf00a Merge pull request #4896 from VOREStation/pol-qdels 
Fix several Destoy()s
 2018-02-21 10:01:23 -06:00
Verkister
d456a6ef8a Small regenerate_icons tweak. 
Alright the previous attempt didn't quite work as intended, sorry for that.
Anyway I was checking out what sorta things happen to use the legacy support regenerate_icons human proc and found out some of them had connections to circumstances I've heard of causing trouble. Found out all the update calls included in it came with a 0 to prevent each call from doing update_icons on its own before the intended calls at the bottom of the bunch, except for one, UpdateDamageIcon, which also did have the same (var/update_icons=1) skip expectation as the others, causing premature dupe updates in regenerate_icons.
 2018-02-21 12:48:52 +02:00
Atermonera
4a5be308f3 Merge pull request #4893 from Anewbe/attacktext 
Slimes should no longer /list you.
 2018-02-21 00:35:38 -08:00
Atermonera
4b7d67a2b0 Merge pull request #4876 from Anewbe/dangerous_animals 
Simple mobs respect armor pen, sharp, and edge
 2018-02-21 00:34:24 -08:00
Anewbe
0302ab89ef Simple animals shouldn't be hit twice per click 2018-02-20 19:48:14 -06:00
Cyantime
c1cdbacfe4 Corrects inkling color blend mode 2018-02-20 18:23:12 -05:00
Screemonster
67c8d706dc more sanity checks and sensible syntax 2018-02-20 23:22:04 +00:00
Mechoid
8a3dcc5cc1 Makes Mining Satchels brute-force their way out of lagging, minerborg prodding. 2018-02-20 12:58:13 -08:00
Arokha Sieyes
0c0f09fe68 POLARIS: Fix several Destroy()s 2018-02-20 10:00:23 -05:00
Screemonster
421aa33c40 Gets rid of the sleep() altogether and also that client rotation thing that breaks everything 2018-02-20 10:15:17 +00:00
Anewbe
6446328d09 Slimes should no longer /list you. 2018-02-20 01:58:49 -06:00
Verkister
1bcbcc926d Preview background fixes and additions. 
-Fixes flat white background capitalization error.
-Re-enables tunnel plating and reinforced floor.
-Adds darker plating, ribbed techmaint tiles, and flat middle grey.
-Tweaks their cycle order to cycle flats by shade, and then tiles by shade.
-Moves our update preview code underneath the polaris original.
-Polaris bg list update waiting for merge out there as well, but let me know anyway if I should do a temporary vorestation edit comment until next sync tho.
 2018-02-20 09:52:56 +02:00
Arokha Sieyes
e3215c98e1 VS: Fix serveral Destroy()s, VS edition 2018-02-20 00:21:29 -05:00
Arokha Sieyes
a75cfe0eb1 POLARIS: Fix several Destroy()s 2018-02-20 00:20:46 -05:00
Mechoid
39e737f2a3 Merge pull request #4846 from Anewbe/wetslime.nt 
Prometheans are bothered by water
 2018-02-19 20:28:26 -08:00
Arokha Sieyes
736d5a9531 Allow shadekin phase-shift noms 
Allows shadekin to phase in on people, and if they are set to be a dropnom pred in the vore panel, they'll belly the person they land on.
 2018-02-19 17:45:26 -05:00
Anewbe
d498beffdb Merge pull request #4878 from Verkister/sucktoes 
Fixes uncleanable feet.
 2018-02-19 14:00:16 -06:00
mistyLuminescence
d0cd553514 Crashed Medical Shuttle PoI (#4863) 
* Adds a crashed medical shuttle PoI

* Updates
 2018-02-19 13:48:30 -06:00
Screemonster
6769c04a44 I think I've spotted that fucking bug that was plaguing me. 2018-02-19 14:30:28 +00:00
Screemonster
635bbb7a73 Adds "monster tamer". 2018-02-19 14:03:34 +00:00
Verkister
da0a230bd5 Fixes foot washing. 
-Foot washing proc was using a wrong and nonexistent var instead of the one actually assigned for cleaning feet by showers and such.
 2018-02-19 08:12:56 +02:00
Anewbe
8afd1b42b3 Simple mobs respect armor pen, sharp, and edge 2018-02-18 23:14:50 -06:00
Arokha Sieyes
309082a089 Shadekin added invisibility 2018-02-18 23:06:15 -05:00
Arokha Sieyes
478016793c Shadekin set realname when shifting 
Only humans do automatically, it seems. Not an issue for admins, but later it might be.
 2018-02-18 21:29:27 -05:00
Arokha Sieyes
eb78b87458 Add orange/green shadekin 2018-02-18 20:05:44 -05:00
Verkister
8a731a8bc8 Another attempt at leg icon generation fixes. (#4839) 
-Makes leg icon cache code little more robust in the hunt of the dreaded bugson dismemberment crash.
-The old leg layer direction caching code was pretty slippery to grasp and basically the only thing left separating it from the other well behaving limbs at this point.
-The cache blending runs each limb on its own so there is no practical need to (con)fuse the left and right legs together like that.
-Not entirely sure how exactly the old code did the stuff(itjustworks.ogg), but the new one goes straight to the point, picking the side of the processing limb, grabbing its overlay appropriate direction icons onto one temp, blending the overlay set onto base before grabbing the underlay appropriate dir by itself into a separate(free of the overlay temp shenanigans) and underlay blending it onto the base.
 2018-02-18 11:47:27 -08:00
Anewbe
6ae7f434b4 Should squash two runtimes (#4868) 2018-02-18 11:46:50 -08:00
Anewbe
82889f60a2 Corrects a few accuracy/evasion errors (#4864) 2018-02-18 11:44:43 -08:00
Anewbe
7afe6dd1ff Merge pull request #4858 from VOREStation/pol-surgicon 
Clean up some recent update_icons() changes
 2018-02-18 13:44:05 -06:00
Aronai Sieyes
c36d01939c Merge pull request #3061 from VOREStation/aro-sync 
Smol Sync
 2018-02-18 00:56:41 -06:00
Aronai Sieyes
9fe14358a7 Merge pull request #3060 from VOREStation/aro-sklang 
Gives shadekin a (private, unlearnable) language
 2018-02-18 00:35:12 -06:00
Arokha Sieyes
5967bb6dc5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-6.dmm
 2018-02-18 00:25:36 -06:00
Aronai Sieyes
4d9eacbd75 Adds mars 2018-02-18 00:22:43 -06:00
Aronai Sieyes
b1b2551b9c Merge pull request #3058 from VOREStation/aro-joinspeed 
Half character-join lag
 2018-02-17 23:41:05 -06:00