cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,677 Commits 7 Branches 0 Tags
c39a91eae124873bb4cc358eb25c38418a76d8eb
Commit Graph

31649 Commits

Author SHA1 Message Date
Aronai Sieyes
c39a91eae1 Merge pull request #3325 from VOREStation/Cameron653-patch-1 
Removes excavation drill since it's been ported upstream
 2018-04-08 20:41:11 -04:00
Spades
a72abf203d Merge pull request #3407 from Little-119/rings-fix 
Changes wedding rings to be a subtype of ring
 2018-04-08 07:26:38 -04:00
Little-119
6ebe2269c4 Changes wedding rings to be a subtype of ring 
Also moves them to their own .dm, since they're now a subtype of the thing in rings.dm. Also changed bethrothed to spouse, as the former is usually before marriage and not after.

Benefits of this include: Being able to wear gloves over wedding rings. Making them tiny instead of small. Making their gender neuter instead of plural, so it wont say "some wedding ring" when you examine someone wearing them. Probably more good things.

Issue reported by HzDonut.
 2018-04-08 01:06:36 -04:00
Aronai Sieyes
e49e883f5f Merge pull request #3384 from Cameron653/VOX_STUFF_FIX 
Fixes vox not having hardsuit sprites.
 2018-04-06 15:39:55 -04:00
Aronai Sieyes
58a2459c6d Merge pull request #3385 from Michiyamenotehifunana/egun-replacer 
Overrides the base Energy Gun sprite with a good looking one
 2018-04-06 15:36:59 -04:00
Aronai Sieyes
2f8063c560 Merge pull request #3380 from Ketrai/patch-8 
Nerfs solargrub drain speed.
 2018-04-06 15:34:44 -04:00
Aronai Sieyes
dc3a587b7f Merge pull request #3390 from Verkister/collors 
Small Shock/Holo collar tweaks.
 2018-04-06 15:11:16 -04:00
Leshana
c8dd30846c Merge pull request #3378 from VOREStation/polaris-sync-2018-03-30 
Polaris Sync 2018-03-30
 2018-04-06 14:42:19 -04:00
Michiyamenotehifunana
2318db9cd7 Improves contrasts on sprites and removes the need for mirroring upstream sprites 2018-04-06 17:59:10 +08:00
Ketrai
26d028a16f Update solargrub.dm 2018-04-06 11:40:26 +02:00
Verkister
5d8b6cd1a6 Small Shock/Holo collar tweaks. 
-Updates their old >> dialogue.
-Makes shock collars taggable.

Was gonna fix them showing up in forced lowercase on people but that turned out to be a separate polaris issue that I just opened a fix for up there.
 2018-04-05 15:48:03 +03:00
Michiyamenotehifunana
50d7706cd2 Fixes Pathing 2018-04-05 20:21:15 +08:00
Cameron653
5fe6ae2125 Fixes vox not having hardsuit sprites. Uses the new defines. 2018-04-03 16:19:07 -04:00
Leshana
9634cf04ce Don't kick admin observers for inactivity. They might be waiting for ahelps. 2018-04-02 22:48:00 -04:00
Ketrai
9cac16375a Nerfs solargrub drain speed. 
Due to the lack of saturation in the moderate event container, solargrubs show up way too frequently, and changing the frequency doesn't help. The container has to pick. This change will just bump the drain speed down so severely, that if you kill one or two grubs, the station should barely feel the impact anymore. As opposed to having to kill 4/5 grubs on average.

Gradual nerfs seem logical, as grubs get more and mroe of a day-to-day experience, and most people know about them now. Time to stop the witch hunting for those annoying grubs :p
 2018-04-02 12:19:26 +02:00
Cameron653
f66f87b1f6 Fixes a bug. It's flatland zorren. 
Fixes #3376
 2018-04-01 23:07:12 -04:00
Leshana
666215bae8 Merge pull request #3369 from VOREStation/aro-posiempty 
Fixes infinite loop in FBP naming w/o client
 2018-04-01 19:17:38 -04:00
Leshana
88c4ca0246 Fix light/camera layers for macros and fix constants for them too. 2018-04-01 16:29:52 -04:00
Leshana
07c0ef2b8a Fix unused variable warnings. 2018-04-01 16:17:35 -04:00
Leshana
6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30 
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-03-31 09:20:59 -04:00
Arokha Sieyes
794185d3f2 Fixes infinite loop in FBP naming w/o client 2018-03-29 23:46:19 -04:00
Neerti
9ff18723f4 Merge pull request #5128 from Atermonera/pai_mani 
Fixes #4951
 2018-03-29 23:21:15 -04:00
Neerti
f5c331b142 Merge pull request #5127 from VOREStation/vplk-table-layer-fixes 
Table Layering and Runtime Fixes
 2018-03-29 23:20:57 -04:00
Atermonera
a54522751b Change of template 2018-03-29 18:16:04 -07:00
Leshana
15936a9eb1 Fixes Runtime in logging.dm,61 2018-03-29 21:05:53 -04:00
Leshana
779e6f177d Fixes machines being below tables they should sit upon. 2018-03-29 21:03:45 -04:00
Leshana
530c3e9a07 Fixes fullbright mode hiding lighting overlays. 
Fullbright plane master being above lighting plane master is important, shouldn't be removed.
 2018-03-29 20:20:47 -04:00
Atermonera
4b5fdb9825 Merge pull request #5076 from Anewbe/advanced_medkits 
MDs and EMTs spawn with the white medkit
 2018-03-29 16:31:10 -07:00
Arokha Sieyes
b610a35887 Fix for MOB_CAN_SEE_PLANE 2018-03-29 15:20:55 -04:00
Anewbe
92df13c8c1 Merge pull request #5098 from Woodratt/03232018_randomaddsntweaks 
Changes to objects random
 2018-03-29 12:37:14 -05:00
Leshana
1ae7f45f1f Merge branch 'master' into vplk-port-pipeland-theta 2018-03-28 17:47:21 -04:00
elgeonmb
499f6c84df prettified lorecodex, added a month's worth of news (#5112) 
* prettified lorecodex : added a month's worth of news

* what the hell elgie

* all according to kaikoku
 2018-03-28 13:01:29 -07:00
elgeonmb
0a1e3d798b Lore-Compliant Oculum News Channel (#5111) 
* adds an e-reader full of news to the loadout

* Political Almanac -> Pocket Newscaster

* new news channel containing lore-compliant news that's not bad
 2018-03-28 13:01:10 -07:00
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072) 
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
 2018-03-28 12:59:12 -07:00
Atermonera
a2841ce9d6 Nanoui now supports use of multiple templates (#5105) 
* Nanoui now supports use of multiple templates

* Removing debug code, indentation

* Indentation
 2018-03-28 14:53:50 -05:00
Atermonera
6adbe5537e Merge pull request #5079 from BillyBangles/they-arent-sharpies-i-swear 
Adds permanent markers
 2018-03-28 11:49:10 -07:00
Neerti
e17d441348 Merge pull request #5107 from VOREStation/aro-ports-03252018 
More VS Ports
 2018-03-28 11:41:27 -04:00
Arokha Sieyes
5a4a154248 Probably maybe fixes blank lines for prey 2018-03-27 20:22:40 -04:00
Neerti
3de715ef55 Fixes Suit Storage Icons 
Items in suit storage should no longer vanish.
 2018-03-26 00:41:55 -04:00
Arokha Sieyes
f6321228a0 POLARIS: Adds an animation thing, uses it on ventcrawls 2018-03-25 17:42:48 -04:00
Arokha Sieyes
6072077d10 POLARIS: Add eye color to shapeshifters 2018-03-25 17:18:34 -04:00
Arokha Sieyes
9012958724 POLARIS: Heal robolimbs when you heal everything 
Typically only used in magic and stuff, makes sense to heal both (otherwise there's no way to heal whole FBP bodies)
 2018-03-25 17:15:11 -04:00
Arokha Sieyes
7cac2052b5 POLARIS: Fix incorrect robolimb checks 2018-03-25 17:14:46 -04:00
Arokha Sieyes
f7d79855a0 POLARIS: Fix a call to the wrong update icons in prom regen 2018-03-25 17:14:21 -04:00
Arokha Sieyes
e8258ff13f POLARIS: Beam weapons runtime when you shoot yourself 2018-03-25 17:09:56 -04:00
Arokha Sieyes
ef904f453c POLARIS: Sometimes items have this set to null because they are bad. 2018-03-25 17:09:47 -04:00
Arokha Sieyes
9f4a14b171 POLARIS: Weird snacks runtime 2018-03-25 17:09:33 -04:00
Arokha Sieyes
3d4fe98277 POLARIS: Allow crawling through vertical pipes 2018-03-25 17:08:53 -04:00
Leshana
d738e99d2f POLARIS: Fix holders to avoid forcemoving held mob to nullspace 2018-03-25 17:08:29 -04:00
Arokha Sieyes
e14857b169 POLARIS: Ventcrawling assistance 2018-03-25 17:07:54 -04:00