cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 10:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,499 Commits 9 Branches 0 Tags
ed79946ade0b901b30e7c57b0c429a0db86bf16f
Commit Graph

62 Commits

Author SHA1 Message Date
CHOMPStation2
ab154b48b2 [MIRROR] refactors most spans (#9139) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-04 15:00:17 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02:00
tacoguy7765093
b6336b3d48 Zorgoia patches (#8784) 2024-08-16 00:44:43 +02:00
CHOMPStation2
d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
Verkister
540b86c4f4 Adds giant lab rats (#6901) 2023-09-03 17:47:51 +02:00
Raeschen
23714a7b86 more chomp-specific name changes 2023-07-05 10:36:41 +02:00
Raeschen
1e2deb86ed missing comma 2023-07-05 10:21:45 +02:00
Raeschen
740a877f89 readd some chompedited stuff 2023-07-05 10:18:45 +02:00
Raeschen
0e680b38a5 missed conflict 2023-07-05 10:14:43 +02:00
Raeschen
3e0a0c0c98 big resync + merge conflicts 2023-07-05 10:12:39 +02:00
Casey
19550009ce Tweaks and tidying 2023-07-03 10:24:10 +00:00
Heroman3003
4a38648ead Merge pull request #13974 from TheDavestDave/cargo-update 
lets cargo order a pair of great tits
 2022-10-29 07:38:10 +00:00
Verkister
21417259ea Enables cargo otie crates 
Also adds a few more rng types for the said crates.
Unmarked earlyport for now i guess
 2022-09-06 16:30:44 +03:00
Chompstation Bot
28c2ee46d3 Adds a weretiger. 2021-07-07 21:08:45 +00:00
Chompstation Bot
c4161dc8d0 Adds some fennec treats 2021-05-20 19:55:01 +00:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Rykka
cf2a964018 Adds Rabbit to Predcrate, someone else can make a smaller crate 
Also fixes rabbit body colors
 2020-08-26 22:23:45 -04:00
Shadowfire
7fc2c5e092 Casino updoot 
New features:

New category of prizes; Pets! Anything from a tame chicken or goose all the way up to absolute unit Oties and Zorgoias!
New custom looking spawner grenades for casino mobs, dont flash and blind people, perfect for a party trick!
New casino security id card!
Zorgoias have a chance to show up in predator crate!
Two gorgeous new crowns, the crowns of the king goose and the queen goose, sprited by our lovely artist Kassc!

bug fixes and edits:
Renamed Jack's brew to Rush hour... What was I thinking calling it that?
fixed casino prize dispenser flashing 'price' instead of 'prize'
Fiddled with slot machine, hopefully not everyone will constantly get the platinum chip, might need more adjustments
Fixed wrong access requirements in casino bar
Put access restrictions on the windoors to the prize booth
sunglasses in casino recroom
Fixed casino wallets, now they can hold what normal can hold AND card decks, casino chips, casino manual and platinum chip!
Put a resleeving pod in the casino medbay, for easier resleeving during events!
Reworked access restrictions to casino security area, casino security uses 201 as their access number
 2020-07-23 14:57:13 +02:00
Heroman
af94e7f374 Fixes some mimic bugs 2019-08-26 10:29:41 +10:00
Heroman
9b56460487 Fixes a typo 2019-04-02 17:57:30 +10:00
Heroman3003
eebd7c64a9 Fixes passive and mostly passive mobs blocking the way all the time 2019-04-02 09:27:24 +10:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Sebbe9123
420803122b re-fixes this file since it wasn't obvious I was a brainlet before. 2019-02-20 23:50:07 +01:00
Sebbe9123
b6b4980ea8 Fixes largecrates for real, i'm a fucking brainlet. 2019-02-18 10:46:07 +01:00
Sebbe9123
c0e0afe919 Fixes most crates in largecrave_vr. Oties still broke. 2019-02-18 10:25:28 +01:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Heroman3003
1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Verkister
d1ab58b7f8 Little tweaks etc. 
-Renamed heckboy paths.
-Fixed a sprite inconsistency.
-New latin names.
-Feral red changed to cult faction.
-Changed red tame chance to 20%.
-Made "experimental environment" otie crate have a 20% chance to contain a friendly red instead of phoron.
 2018-06-25 11:33:19 +03:00
Verkister
49e7cb1bcd Adds "redspace" oties. 
-Stats-wise identical to phoron mutants for now.
-Can appear in dangerous pred crate.
-Commissioned for shenanigans etc.
 2018-06-24 16:34:24 +03:00
Ketrai
c351f1d3b0 Adds a fennec crate to cargo. (#3810) 
* Adds a fennec crate.

Adds a fennec crate with a smaller chance of containing fennix.

* Adds a fennec crate

* Update hydroponics_vr.dm

* Fixes an error?

* Update largecrate_vr.dm

* Update largecrate_vr.dm
 2018-06-11 06:06:49 -04:00
Verkister
1222e5d0d6 Merge branch 'master' into hangryrat 2018-05-28 15:08:53 +03:00
Arokha Sieyes
b96aec1e52 SYNC: Missed another closet (typo) 2018-05-27 19:53:45 -04:00
Arokha Sieyes
1437123502 SYNC: Missed one 2018-05-27 19:43:39 -04:00
Arokha Sieyes
8f8c41a7c1 SYNC: Correct vorestation closets/crates to use new system 2018-05-27 19:33:34 -04:00
Arokha Sieyes
c4f9017c76 Rename snake to giant snake 
To prevent mistakes like this in the future!
 2018-05-10 14:26:18 -04:00
Verkister
f8d6449bc1 pathing update 2018-04-30 20:30:16 +03:00
Spades
b06b1d16a8 Makes file pathing for mobs not complete autism 2018-04-28 13:37:41 -04:00
Verkister
ed1e1aaa5c renames to bigrat, adds neutral one to pred crate as well 2018-04-16 09:51:59 +03:00
Verkister
2dec2545e5 Adds giant rat voremob. 
-Currently only available via pred crate/shenanigans.
-This dude is friends with regular mice but will gladly kick any other ass.
 2018-04-11 20:44:53 +03:00
Aronai Sieyes
526e886a21 Merge pull request #2994 from Verkister/badboi 
Adds a fancy new voremob.
 2018-02-10 23:04:47 -06:00
Silver
8c36391925 Propernaming for VIRGO PR#3000 
https://github.com/VOREStation/VOREStation/pull/3000
 2018-02-08 17:45:12 -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
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
Verkister
3a4d470604 disables pc grab growl while travis sucks legs over unrelated map bugs 
some minor sprite tweaks

environmental disaster time

more things

bumps front and back rest sprites one p down

Some otie tweaks plus another new variant.
-Stops idle actions on player-controlled oties.
-Disables feeding autobarf (secdonut and rng) on player-controlled oties.
-Disables friending and auto standup on petting when player-controlled.
-Adds a tamed phoron otie with collar. (no ingame access yet so beg for mins)
-Tweaks the bare standing sprites a little. (one pixel shorter with even back stripes)
 2018-01-29 09:02:48 +02:00
Verkister
bc5b5e7b44 Brings back some slightly tweaked individual oties. 
-With the lack of any in-depth borkage documentation, I felt like staying with my earlier point of the big issues being likely caused by vast numbers of these feature heavy snowflake mobs being spawned for wilderness cannonfodder en masse, which the current wildernessless build would rule out for better troubleshooting.
-People had been missing these in IC near my chars in multiple occasions recently and I didn't have the heart to tell em they were gone lmao.
-Only available via cargo orders now.
 2017-09-23 14:24:40 +03:00
Spades
6eb472f31d Revert "Adds a new event - Solargrubs!" 2017-09-09 12:24:37 -04:00
Ketrai
03196646a9 adds solargrub to predator crate 
coz whynot, we got carp in there
 2017-09-05 16:15:03 +02:00
Spades
4eeabfc657 TRAVIS STOP 2017-08-27 02:23:39 -04:00