cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-20 18:46:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,773 Commits 66 Branches 25 Tags
TravisFix-1
Commit Graph
638 Commits
Author SHA1 Message Date
TheFurryFeline 93c4c2b5cf Closet Access Tweak 
Add an additional level of access to command secretary locker so secretaries can actually access it when needed.
 2019-05-31 00:32:07 -04:00
TheFurryFelineandGitHub 2703c81029 Command Secretary Closet 
HOP access, allows for distribution of extra headsets if needed.
 2019-04-07 16:18:50 -04:00
Shadowfire117 f652d5c732 Merge branch 'master' of https://github.com/Shadowfire117/CHOMPstation 2019-01-30 20:20:28 +01:00
Shadowfire117 d58ab8d98c Chocobos 2019-01-30 20:17:04 +01:00
TheFurryFelineandGitHub 21f3a0a188 Add Fennec Crate 
Part 2 of Fennec Palooza.~
 2019-01-14 20:04:41 -05:00
Shadowfire117 20dc646893 adding in a new deer mob that can be ordered in cargo for festives decorations and meals. 2018-12-04 18:43:00 +01:00
IgnusVam b0734d5aa1 Big update 
- Fixes spiders (I hope?) - Spiders now spawn in groups of 2-8, growing up should be fixed as well.
- Christmas-ifies all the maps
- Minor tweaks all around the stations
- Cleans up the map for central (a lot)
- Adds a new mob to the spawn list in the mines
- Fixes some minor shadekin issues
- Fixes it so borgs/AI can't understand gutter
- Modifies the timing of the radiation storm
- Hopefully fixes the cargo request event. No more buggy gas mixtures.
- Adds a flamboyant crate
- A bunch of other stuff.
 2018-11-29 12:35:52 -07:00
IgnusVam 5298501e0b Finally fixes fireaxes after almost a year of waiting. 2018-10-23 19:26:14 -06:00
Reddeyfish 635013f331 Merge branch 'virgoMaster' into virgoPull 2018-06-10 12:33:29 -07:00
AnewbeandVirgoBot b5eea2cffa Merge pull request #5320 from VOREStation/pol-hoods 
Radiation closet hood fix
 2018-06-02 16:23:08 -04:00
VerkisterandGitHub 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 2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
 2018-05-27 19:26:12 -04:00
AtermoneraandGitHub e1fe4d5a5d Merge pull request #5293 from VOREStation/pol-closets 
Makes closets/crates like boxes
 2018-05-26 15:24:45 -07:00
Arokha Sieyes 6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018 
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.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/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-05-25 13:23:47 -04:00
Anewbe 9bc6663930 Crates should always appear below their contents 2018-05-24 17:24:14 -05:00
Arokha Sieyes f9b409549e Makes closets/crates like boxes 
Gives them a 'starts_with' (well, renames the existing one. Someone ported it but never actually applied it anywhere).
 2018-05-24 17:26:17 -04:00
Reddeyfish 813d7bf643 Merge branch 'virgoMaster' into virgoPull 2018-05-19 17:16:17 -07:00
Arokha Sieyes 7ec5adf010 Remove some missed spare helmets 
Fixes #3724
 2018-05-18 14:42:29 -04:00
Arokha Sieyes bdfa34c911 SSAO object excludes 
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
 2018-05-14 11:54:10 -04:00
Arokha Sieyes 91f0c05a4b SSAO object excludes 
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
 2018-05-14 11:38:22 -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
Mechoid 4d028ee0f3 Removes my incompetence. 
Re-adds my incompetence.
 2018-05-08 18:41:47 -07:00
Mechoid 3a2f21ca31 Weak mobs (Below 10 damage output) cannot smash destroyable structures like Closets. 2018-05-08 16:19:44 -07:00
Arokha Sieyes c4cbe31199 Removes taur suits 2018-05-04 22:16:17 -04:00
Verkister f8d6449bc1 pathing update 2018-04-30 20:30:16 +03:00
Neerti be73b8c36a for(var/bad_code in world) 
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
 2018-04-29 17:55:04 -04: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
Reddeyfish 0af8620ee1 Merge branch 'virgoMaster' into virgoPull 2018-04-15 11:06:40 -07: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
Reddeyfish b52bb9a7f0 Add custom items for Igni/Kelly Summers 2018-04-05 19:11:40 -07:00
Arokha SieyesandLeshana 6158cd1d26 POLARIS: Use drop_location() for things 2018-03-13 19:23:46 -04:00
Arokha Sieyes 4538a6859f POLARIS: Use drop_location() for things 2018-03-08 13:03:09 -05:00
Arokha Sieyes f04c58f202 VS: Rewrites basically all of how bellies work 
And cleans up a ton of stuff.
 2018-02-27 13:29:45 -05: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
Anewbe 8c5dc66a13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-21 23:33:17 -06:00
AnewbeandAtermonera 25a1f47a30 Headset sprites, planetside headset functionality (#4869) 2018-02-20 12:36:22 -08: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
Anewbe cce3c607f2 HoS/Warden helmet tweaks 2018-02-17 15:57:26 -06:00
Leshana ef3df27528 VOREStation Specific Merge Changes 
* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.
 2018-02-17 16:56:31 -05:00
Anewbe b7658d49ab Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor 2018-02-17 15:22:28 -06:00
AnewbeandAtermonera 7cc8fa0cba Gives Miners shinybits. (#4840) 
* Gives miners marker beacons, moves their locker to another file

* Makes marker beacons ITEM_SIZE_SMALL
 2018-02-17 11:19:48 -08:00
Anewbe 5c9fd04ed3 Fixes some goofs 2018-02-17 01:19:57 -06:00
Leshana 7ed3d2c2f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16 
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
 2018-02-17 00:35:29 -05:00
Aronai SieyesandGitHub 526e886a21 Merge pull request #2994 from Verkister/badboi 
Adds a fancy new voremob.
 2018-02-10 23:04:47 -06:00
SilverandGitHub 8c36391925 Propernaming for VIRGO PR#3000 
https://github.com/VOREStation/VOREStation/pull/3000
 2018-02-08 17:45:12 -06:00
MechoidandAnewbe 251297a2ba Promethean Balancing, Lore-compliant Modification of Security Equipment (#4722) 
* Works on Balancing Prometheans

* Reorganize from Master Merge

* Tries to fix that gun conflict that the DMI merger apparently did fine?
 2018-02-08 14:58:17 -06:00