cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 11:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,630 Commits 7 Branches 0 Tags
e9abd9894de9122d4b16b3ea8c70a96370138d84
Commit Graph

176 Commits

Author SHA1 Message Date
Heroman
00917e8e8b Adds a very familiar plushie 2020-07-31 19:07:45 +10:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Cerebulon
4a87460ba8 Flavour Enhancement: Crates 2020-07-21 22:20:30 -04:00
Cerebulon
f1f2196077 Flavour Enhancement: Guns 2020-07-13 23:06:11 -04:00
Novacat
23967ce999 Merge pull request #8379 from VOREStation/upstream-merge-7324 
[MIRROR] Add a random mech spawner (Not mapped in yet)
 2020-07-09 23:33:24 -04:00
Kates
e4389f170c Add a random mech spawner (Not mapped in yet) 2020-07-09 18:13:36 -04:00
Killian
9adf026d61 Update maintenance.dm 2020-07-09 04:43:32 +01:00
Killian
0ee78b5da3 balls: loot & vending 2020-07-04 22:50:14 +01:00
lbnesquik
856d48467a Introduce a SINGLE themed, colored explorer shield 
It is a simple hunk of metal, painted to a moody green or dangerous voidsuits purple and blacks.
It has a lower block chance than the real deal, but it is still a strong help against melee foes and the occasional beam or two. Do mind that those seem to be a lot squishier since the AI update.
And just like any tacticool object, it has a big flashlight stuck at the front to help with visibility, it's not like you can actually see much out of that slit.
You can order two for 80 points at cargo.
It actually starts in the pathfinder locker, meaning they decide whether or not it will be used.
 2020-06-11 04:14:54 +02:00
Atermonera
c8e5abc937 Random item spawners qdel properly on init without using sleep (#7134) 2020-05-15 16:36:09 -04:00
Aronai Sieyes
2c2e9c8e0d v e n d o t t 2020-05-14 22:29:16 -04:00
Novacat
de0bd4181a Merge branch 'master' into upstream-merge-7070 2020-05-03 11:37:30 -04:00
Aronai Sieyes
e9deffdefd Update mob.dm 2020-05-03 11:32:00 -04:00
Mechoid
8d328777b7 I love BYOND RNG, it is perfect and 100% reliable for testing. 2020-05-02 18:50:57 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Atermonera
0d80f24a5f Replaces toy waterflower with spraybottle waterflower (#6997) 2020-04-20 03:25:38 -04:00
Aronai Sieyes
d13d3d92fe Ports some plushies from Cit 2020-04-19 23:32:20 -04:00
Unknown
b5f337a3b0 Replaces Tramadol maint pills with Paracetamol 2020-02-16 10:54:55 -05:00
Heroman3003
718feb1ebe Adds pineapple pizzabox (#6682) 2020-02-13 17:11:43 -05:00
Heroman
38bf0a33c6 Fixes and re-implements Rogue Mining (Belt Mining) 2020-01-23 18:43:20 +10:00
drexample
041db96898 WE ALWAYS DELIVER 2020-01-11 23:22:18 +03:00
drexample
747114793c WE ALWAYS DELIVER! 2020-01-11 05:28:00 +03:00
Heroman3003
caf274951c Implements ML-3M, Adds prototype NSFW 2019-09-17 11:24:58 +10:00
Unknown
d86972851a Whoops 2019-09-09 23:48:35 -04:00
Unknown
aa2a3682b9 Merge remote-tracking branch 'VOREStation/master' into medbeam 2019-08-31 15:32:22 -04:00
Unknown
9467621800 Fixes some errors 2019-08-31 00:35:19 -04:00
Unknown
0d73c8ad76 Early Polaris Ports 
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
 2019-08-30 23:55:58 -04:00
Mechoid
ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
if there were two guys on the moon
62b14805d5 adds ml3m to closets and stuff 2019-07-27 16:16:10 +01:00
if there were two guys on the moon
163ac56503 sprites and map fix 2019-07-22 23:20:00 +01:00
Heroman
c11a1fc16e Fixes spawning of action figures in crates. 2019-07-01 06:49:27 +10:00
Woodratt
8c3a430e8d June Map Adjustments 2019-06-18 13:34:12 -04:00
Anewbe
223dc48961 Merge pull request #6218 from Mechoid/RandomSpawnerFix 
Fixes random item spawners not self-deleting.
 2019-06-16 20:57:20 -04:00
Neerti
5a3040a08d Merge pull request #6183 from Mechoid/FixPrecursotechOversights 
Fixes some Precursotech oversights.
 2019-05-31 22:18:00 -04:00
Sebbe
82e9cf4a29 Did the doo as requested 2019-04-17 09:29:31 +02:00
Sebbe
224ce6582b Hopefully fixes every path 
plz game, I didn't have fun ;w;
 2019-04-16 10:41:04 +02:00
Neerti
b9b14144b0 Merge pull request #6036 from PrismaticGynoid/butchershack 
Butcher shack PoI
 2019-04-06 05:00:42 -04: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
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Neerti
91a5203e32 Adds New PoI Features + Bonus PoI 2019-03-27 12:15:50 -04:00
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Sebbe9123
bd89126955 Fixes random_vr except oties 2019-02-18 09:08:36 +01:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Unknown
7324e5f1dc Splits first aid kit spawning 
Removes the override on first aid kit spawning preventing combat kits from being spawned, but adds a new 'Tetheraid' first aid kit spawn to prevent combat kits from spawning on the Tether, but allows them for expedition sites which still use random spawns.

Also changes the obj/random/maintenance randomly generated item to also only spawn 'Tetheraid' first aid kits, since it shows up twice on the Tether.

TL;DR, it splits first aid kit spawns into one for use on the Tether, which do not have a combat first aid kit, and one used outside the tether (such as POIs) which do have the possibility of spawning a combat first aid kit.
 2018-10-21 20:49:25 -04: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
Woodratt
ea200b8318 Map Bugfixes 
-	Fix for mislabeled c_tag cameras, first deck
-	Fix for mislabeled c_tag cameras, second deck
-	Fix for poi crashed containment shuttle mapping issues (terrain generation)
-	Fixed wrong floor type on skipjack
-	Fix for scrubbers pipe, central substation
-	Fix for air supply pipe, chapel
-	Fixed scrubber pipe, Engineering Drone Fab
-	Fix for air supply pipe, Prison Wing
-	Removed redundant supply and scrubber pipe, Security Auxiliary Dock
-	Fix, Fore Aux Dock airlock pipe.
-	Fix air supply pipe, library
-	Fix, scrubber pipe, coffee shop
-	Pipe fix, Medical maint
-	Fix, supply pipe medical secondary storage
-	Removal, redundant supply pipe, cargo maint
-	Fix, virology scrubbers pipes
-	Fix Xenobio and Xenoflora missing atmos connection to the main outpost
-	Fix, missing atmos connections between Main outpost telecoms and main outpost atmos
-	Fix for missing power wires, HoS Office, Warden Office, Heads of Staff Meeting Room
-	New, random mouse spawner
-	New, random mouse spawners added throughout maintenance on the station (maybe too many, maus station 13)
-	New, 30 sheets of lead added to engineering
-	Fix, POIs should now be rad protected and characters won’t be affected by the radiation event
 2018-09-11 21:39:46 -07:00