cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,453 Commits 8 Branches 0 Tags
f656dd6dfb6f67e81cb155535f0e26af6b6c58f3
Commit Graph

693 Commits

Author SHA1 Message Date
Unknown
55b4d304f5 Conflict Resolution Part One 2019-03-27 15:21:58 -04:00
Novacat
696872690e Merge pull request #4677 from VOREStation/upstream-merge-5776 
[MIRROR] Adds pressure protection bounds to clothing.
 2019-03-27 15:18:17 -04:00
Novacat
d4f7e752eb Merge pull request #4675 from VOREStation/upstream-merge-5828 
[MIRROR] Fixes antagonist options not appearing in preferences
 2019-03-27 15:17:38 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Neerti
9d46150515 Adds pressure protection bounds to clothing. 2019-03-27 13:26:07 -04:00
Unknown
0e6c82ed60 Conflict Resolution 2019-03-27 12:05:38 -04:00
kevinz000
dfbd0bd72b Upgrades SDQL2 and refactors it to a datum 2019-03-27 11:50:49 -04:00
Unknown
4e67e1b9ab Conflict Resolution 2019-03-27 04:11:30 -04:00
Anewbe
09b01407e3 Adds Various Sounds, Looping Sound System 2019-03-27 03:55:21 -04:00
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -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
Heroman
86f0cb2919 Added ability to toggle and configure contamination and item digestion 2019-03-19 14:46:07 +10:00
Spades
d47c2366de Merge pull request #4558 from VOREStation/upstream-merge-5760 
[MIRROR] Adds BIOACID damage type
 2019-03-02 08:10:04 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Poojawa
6f2548e47b Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735 2019-02-02 03:55:21 -06:00
Atermonera
c064271fb3 Merge pull request #5843 from Anewbe/gibberish 
Adds Gibberish
 2019-01-16 22:46:41 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Neerti
5d102e8ed2 Merge pull request #5828 from Cerebulon/traitorFix 
Fixes antagonist options not appearing in preferences
 2019-01-13 00:29:09 -05:00
Unknown
f5e6898502 Adds Camera/Alarm monitor NIF programs 
Alarm monitors for your engineering staff, and Camera monitors for your security staff. Alarm monitor is set to engine access and camera monitor set to security access.

Has the same pricing as the Crew Monitor program.
 2019-01-07 16:58:59 -05:00
Atermonera
9b62a715c4 Merge pull request #5760 from Anewbe/bioacid 
Adds BIOACID damage type
 2018-12-06 16:20:03 -05:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05:00
Atermonera
0a77d0d70d Borg, Gripper, and Integrated Circuit interaction update. 2018-12-03 20:22:47 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
HungryMoth
c3d9f5ff0a Update species_languages_vr.dm 2018-11-10 17:15:51 -05:00
Neerti
3a9c13b937 Ports Vote to SMC 2018-10-20 01:53:13 -04:00
Neerti
62ac0986ca Makes RCDs Clean Again 2018-10-16 14:17:44 -04:00
Anewbe
e4660c5838 Admin ticket system (for real this time) 2018-10-09 16:31:01 -04:00
Atermonera
fafd85957f Minor issues fix. 2018-10-06 01:17:19 -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
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549) 
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
 2018-09-12 20:51:32 -05:00
Atermonera
0a63e67785 Merge pull request #5508 from Anewbe/robobrain_meathead_fix 
Fixes the bug(s) that allow meat bodies to have metal brains
 2018-08-24 15:00:29 -07:00
Spades
6a95420bf9 Merge pull request #4064 from VOREStation/upstream-merge-5426 
[MIRROR] Fixes a few bugs associated with the Dead Ringer
 2018-08-17 16:07:16 -04:00
Anewbe
e1471886d8 Fixes the bug(s) that allow meat bodies to have metal brains 2018-08-14 23:12:43 -05:00
Anewbe
eebb627f00 Partially ports the GLOB system 2018-08-14 18:14:09 -05:00
Neerti
3b5874d3f1 Weather refactor. 2018-08-11 18:42:36 -04:00
Atermonera
bb575f0d53 Merge pull request #5468 from Anewbe/is_tool 
Hopefully Unnoticeable Tool Refactor
 2018-08-07 22:06:20 -07:00
Neerti
3de28fa6b2 Ambience Refactor (#5476) 
* Refactors how ambience is assigned, removes bad ambience, ports good ambience from tg

* Apparently that file is still used, not worth the salt to remove it.

* Changelog
 2018-08-06 11:12:17 -05:00
Anewbe
5c35b9f284 Forces mech construction to work with the is_tool() procs 2018-08-04 20:42:53 -05:00
Neerti
6ffd299fd7 Merge pull request #5461 from Atermonera/supply_nanoUI 
Refactors supply controller
 2018-08-04 02:55:15 -04:00
Woodratt
cd20465d38 Holomap Port 
- Port of Holomaps from Virgo
 2018-08-02 15:52:56 -07:00
atermonera
ef6c5abf15 Refactors supply controller. 
Supply consoles now run nanoUI
 2018-07-31 19:11:02 -07:00
Cameron653
5fc76df183 Merge branch 'master' into ALRAUNE_STUFF 2018-07-23 20:08:30 -04:00
Atermonera
c07d42e75a Merge pull request #5426 from Anewbe/deadringer_fixes 
Fixes a few bugs associated with the Dead Ringer
 2018-07-22 00:26:47 -04:00
Anewbe
1f0973aa62 Fixes a few bugs associated with the Dead Ringer 2018-07-20 17:50:48 -05:00
Anewbe
edf92c57f9 Language and Larynx Additions 2018-07-14 00:14:49 -04:00
Anewbe
8f9e817bf0 Language and Larynx Additions (#5402) 
* Various Language Improvements
 2018-07-13 21:13:47 -07:00
Aronai Sieyes
f5ff6fec9a Merge branch 'master' into upstream-merge-5401 2018-07-11 21:31:18 -04:00
Neerti
aff66f9037 Taj Sign Language works 2018-07-09 02:00:19 -04:00