cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 09:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,455 Commits 8 Branches 0 Tags
702997ffba030ced09ef1af504610955622c113c
Commit Graph

30616 Commits

Author SHA1 Message Date
Aronai Sieyes
702997ffba Merge pull request #3036 from VOREStation/aro-3010 
Fixes NSFW mode selection
 2018-02-15 18:00:26 -06:00
Aronai Sieyes
f042649448 Merge pull request #3030 from VOREStation/vplk-lightswitches 
Make light switches constructable
 2018-02-15 17:58:20 -06:00
Arokha Sieyes
2dffd17c39 Fix #3010 2018-02-15 02:46:11 -06:00
Mewchild
cb01bd8db5 Ringfix 2018-02-15 00:46:57 -06:00
Leshana
b4b9cea362 Make light switches constructable 
Adds constructable light switches using Brown's construction stage icons.
 2018-02-14 21:26:00 -05:00
Mewchild
bdb99ce7dc Updates Fluff ring so gloves can be worn over it, and so it functions as a stamp (similar to normal signet ring) 2018-02-13 17:13:25 -06:00
Verkister
12e2385dc1 Fixes dead mobs finishing noms. 
-I thought someone would have fixed this already smh.
 2018-02-11 23:06:33 +02:00
Aronai Sieyes
3902093a31 Merge pull request #2991 from Haery70/master 
Haery70 - adds Cookiegirl mobs
 2018-02-11 14:53:20 -06:00
Aronai Sieyes
bee05d5fc4 Merge pull request #3015 from Verkister/bummerspace 
Fixes belly contents showing up on screen inventory
 2018-02-11 14:49:18 -06:00
Aronai Sieyes
979eac5a48 Merge pull request #3004 from Screemonster/ivegotmyionyou 
Ion gun / EMP bugfix and refactor
 2018-02-11 14:48:51 -06:00
Verkister
4be014147e Fixes belly contents showing up on screen inventory 
-Fixes prey backpack contents popping up on pred's screen after getting dumped.
-Adds an automatic closing of prey's storage for pred upon ingestion to prevent "secret backpacks"
-Also makes trash vorings use selected belly sound while at it.
 2018-02-11 14:34:55 +02:00
Screemonster
2cd47f9c80 squashed commits - ion pistol refactor and away mission emp nerf 2018-02-11 09:27:40 +00:00
Aronai Sieyes
7ff0493074 Merge pull request #2998 from Jwguy/Silver-AwooCosplayCrate 
AwooCosplayCrate
 2018-02-10 23:06:35 -06:00
Aronai Sieyes
526e886a21 Merge pull request #2994 from Verkister/badboi 
Adds a fancy new voremob.
 2018-02-10 23:04:47 -06:00
Aronai Sieyes
edb2610633 Merge pull request #3000 from Jwguy/Silver-ContrabandUpdate 
Silver-ContrabandUpdate
 2018-02-10 22:59:28 -06:00
Silver
8c3c0430f6 Correct Origin Tech Values 2018-02-10 22:29:46 -06:00
Silver
ab40c9d38c Added Preferred Change to Deactivation Text 2018-02-10 18:26:51 -06:00
Verkister
519adc1c3e Update badboi.dm 2018-02-10 23:36:24 +02:00
Verkister
d740ae6f90 Fixes itemweak gurgles and food misbehaving 
-Itemweak gurgles no longer add everything unconditionally to items_preserved list even if the item was digested for being food/holder/organ.
 2018-02-10 20:25:39 +02:00
Silver
8c36391925 Propernaming for VIRGO PR#3000 
https://github.com/VOREStation/VOREStation/pull/3000
 2018-02-08 17:45:12 -06:00
Silver
5bfca77f04 Proper Naming for VIRGO PR #3000 
https://github.com/VOREStation/VOREStation/pull/3000

Adds Propernaming
Adds Contraband Variable
 2018-02-08 17:43:23 -06:00
Silver
13b710fb61 Silver-ContrabandUpdate 
Adds AwooCrate and MlemCrate to Contraband Supplypack. (These show up under 'supplies' in a hacked cargo console and are quite expensive)
 2018-02-08 13:01:51 -06:00
Silver
ef4d87a352 AwooCosplayCrate 
Adds Wolfgirl Cosplay Crate to Supplypacks under Recreation.

Adds Wolfgirl Replica Sword and Autumn Shield.

Adds the above and three existing items to aforementioned crate.
 2018-02-08 12:57:18 -06:00
Verkister
d240032910 some changes 2018-02-08 10:57:45 +02:00
Verkister
7afc963393 Adds a fancy new voremob. 
-"corrupt hound". Basically a messed up evil feral borgo.
-Currently only available without bus shenanigans through the dangerous pred crate. Could be added to some expeditions and such I guess.
-Loot drops illegal borg upgrade module.
 2018-02-08 10:11:42 +02:00
Aronai Sieyes
c0a7016d9a Merge branch 'master' into expgun2 2018-02-08 01:13:05 -05:00
Haery70
543574dbfd Update cookiegirl.dm 2018-02-07 23:59:07 -05:00
Haery70
5bcdd2b707 Update cookiegirl.dm 
Editing a part on the examine text regarding the nipples. No need for that.
 2018-02-07 23:57:02 -05:00
Haery70
66fbb3d485 Add files via upload 2018-02-07 23:21:18 -05:00
Aronai Sieyes
999597dad1 Merge branch 'master' into polaris-sync-2018-02-07 2018-02-07 23:06:03 -05:00
Aronai Sieyes
0a415d0047 Merge pull request #2988 from VOREStation/aro-aerostat 
Exploration Update #3
 2018-02-07 22:22:01 -05:00
Aronai Sieyes
2a898f0dfa Merge pull request #2977 from Verkister/patch-8 
Some more gurgle related fixes and tweaks.
 2018-02-07 22:19:57 -05:00
Leshana
a8c7c520bb VOREStation updates related to merged changes from polaris. 2018-02-07 20:08:10 -05:00
Arokha Sieyes
c871e617db VS: Swap two things to ion pistol rather than rifle 2018-02-07 20:03:44 -05:00
Arokha Sieyes
63c498777f VS: Make this define generic 2018-02-07 20:03:44 -05:00
Arokha Sieyes
fb62a2fe45 VS: Two mob tweaks to make them better 
Syndicate and hivebot
 2018-02-07 20:03:41 -05:00
Arokha Sieyes
c493b83531 VS: Simple_animals avoid my custom sky too 2018-02-07 20:03:41 -05:00
Arokha Sieyes
8684fcf4eb POLARIS: Allow simple_animal to avoid turfs 
Like the sky. TODO: Lava??
 2018-02-07 20:03:41 -05:00
Arokha Sieyes
54b6e9de7d VS: Fix a totally unrelated qdel gc bug with a planemaster 2018-02-07 20:03:40 -05:00
Arokha Sieyes
deef737212 POLARIS: New mob var 'low_priority' for skipping life() 
Mobs with this will not have life() called on them unless there's a non-observing player on the same z-level.
 2018-02-07 20:03:40 -05:00
Arokha Sieyes
e82f535d0e VS: Mapping subsystem supports lists only, now. 
That's probably how it should have been.
 2018-02-07 20:03:39 -05:00
Arokha Sieyes
1496a17e63 VS: Adds two mobs: shadekin, jelly 
Shadekin is WIP for now, can be used for events. Jelly is on Virgo 2.
 2018-02-07 20:03:39 -05:00
Leshana
1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 
# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme
 2018-02-07 19:30:50 -05:00
Leshana
a73bf2808d Merge pull request #2976 from VOREStation/vplk-airlocks-cycle-to-ext 
"Planetary" Airlock Controller
 2018-02-07 17:29:12 -05:00
Anewbe
442b5cbdf6 Comments out the automatic firemode code (#4748) 2018-02-07 09:59:42 -08:00
Verkister
78ab5c37f4 Squashed commit of the following: 
commit 88761abcbdad12b25e4771837331ee3c40aeff19
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Feb 7 11:58:47 2018 +0200

    Some more gurgle related tweaks and fixes.
    -Removes gut transfers passing along preserved items list. (redundant with modern digest_act)
    -Adds panel update to trash eating.
    -Fixes borg sleeper gurgles causing double, maybe even triple damage due to being added into processing_objects list multiple times.
 2018-02-07 12:01:11 +02:00
Neerti
54d7537f9c Merge pull request #4738 from Anewbe/hypospray_changes 
Hyposprays and autoinjectors have a delay when used on a target that is not in help intent
 2018-02-07 04:49:04 -05:00
Verkister
d2cb1e3011 Merge branch 'patch-8' of https://github.com/Verkister/VOREStation 2018-02-07 10:56:18 +02:00
Anewbe
8dcaeed33d Merge pull request #4728 from Cyantime/patch-1 
Attacked mobs will always target attacker
 2018-02-06 23:59:23 -06:00
Neerti
2cb7aab49c Merge pull request #4733 from Anewbe/budget_insulated 
Budget Insulated Gloves tweaks
 2018-02-07 00:52:56 -05:00