cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-02 12:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,300 Commits 11 Branches 0 Tags
7478ae0cb64856419522da4ec9dd836ceb59e932
Commit Graph

9108 Commits

Author SHA1 Message Date
Repede
d6889dbdcf Merge branch 'master' of https://github.com/VOREStation/VOREStation 2018-02-26 19:36:57 -05:00
Leshana
7483ede4d2 Merge pull request #3127 from Cyantime/patch-2 
Fixes vasilissan flags
 2018-02-26 02:35:13 -05:00
Kelshark
9bb51e45e4 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/machinery/vending.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	icons/obj/mining.dmi
 2018-02-24 22:51:59 -05:00
Layla Crosse/Occula Drenn
08291c5b6b FIXES GAZER BEING DUMB YET AGAIN 
***EVERY TIME IT'S SOMETHING***
 2018-02-24 21:47:04 -05:00
Anewbe
86e45005bd More accessory runtimes and bugfixes 2018-02-24 20:02:55 -05:00
Aronai Sieyes
436e0e8071 Merge pull request #3120 from VOREStation/aro-saremov 
Remove unnecessary SA code
 2018-02-24 19:28:44 -05:00
Cyantime
878e5b71d5 Fixes vasilissan flags 2018-02-25 00:11:23 +00:00
Arokha Sieyes
484e44c161 POLARIS: Only spam ghosts with chat messages from things with real clients 2018-02-24 18:51:30 -05:00
Layla Crosse/Occula Drenn
7bab64577b Adds Gazer's hairmaw thing for his snowflake character 
Related App: https://forum.vore-station.net/viewtopic.php?f=45&t=1273&sid=f66aadf7535f19fda0a5689a65750ebc
 2018-02-24 15:59:44 -05:00
Aronai Sieyes
f29484f8da Merge pull request #3117 from VOREStation/aro-fbpcells 
Adds a synth backup cell to synth survival box, plus goggles
 2018-02-24 14:43:48 -05:00
Aronai Sieyes
f6d65ec0b8 Merge pull request #3114 from VOREStation/aro-matweak 
Tweak MA constructor
 2018-02-24 14:43:26 -05:00
Arokha Sieyes
581f239bfd POLARIS: FBP backup battery cells for survival purposes 
Usable with <= 100 nutrition, adds 100 nutrition.
 2018-02-24 14:14:21 -05:00
Leshana
4ebbf1ce7a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24 
# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm
 2018-02-24 13:19:10 -05:00
Anewbe
74a4e993ee Merge pull request #4939 from Anewbe/accessories 
Should fix an accessories oversight
 2018-02-24 11:29:50 -06:00
BillyBangles
475d250d6a adds slippery ice tiles (#4935) 2018-02-24 11:04:58 -06:00
Anewbe
5b0aac2a91 Merge pull request #4933 from VOREStation/vplk-macro-qol 
Create client preference for if hotkey mode is enabled by default on login
 2018-02-24 11:03:03 -06:00
Anewbe
2553edc2a0 Merge pull request #4932 from VOREStation/pol-box2 
Small tweak to survival boxes
 2018-02-24 11:02:07 -06:00
Arokha Sieyes
d68629fc80 VS: MA override removal changes 2018-02-24 11:44:57 -05:00
Arokha Sieyes
9bc7510e26 POLARIS: Tweak weird MA override 
Not sure when this is used, but Leshana had a good suggestion for preventing it interfering with things.
 2018-02-24 11:44:57 -05:00
Aronai Sieyes
13dec153ff Merge pull request #3110 from VOREStation/Cameron653-patch-2 
Removed unused fat genetics movement code
 2018-02-24 11:16:18 -05:00
Anewbe
12015d7f5a Merge pull request #4915 from MisterLayne/slimebaton_dropper 
Slimebots drop the right baton.
 2018-02-23 23:44:50 -06:00
Anewbe
99312f323d Should fix an accessories oversight 2018-02-23 22:22:53 -06:00
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
Cameron653
9bf341d199 Removed unused fat genetics movement code 
You can't get it in the game anyways w/o admin abuse. No reason to have an extra  if() check.
 2018-02-23 14:18:36 -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
Leshana
1d11b0d6e1 Create client preference for if hotkey mode is enabled by default on login or not. 
* Adds preference setting for wether hotkeys should default to enabled or disabled.
* Fixes bug for CTRL+NUMPAD8 using old verb name for toggling head.
 2018-02-23 14:16:53 -05:00
Arokha Sieyes
9e20ead03a Small tweak to survival boxes 
Synths start with a unique empty type rather than just an unnamed cardboard box, and don't get a tank or the comprehensive supplies (the only useful thing would be the glowstick, but there are a billion of those).
 2018-02-23 11:51:11 -05: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
MisterLayne
253f00645c Makes things more compact. 2018-02-22 16:21:25 -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
Kelshark
aea1eee615 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt
 2018-02-21 22:19:24 -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