cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 8 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

46 Commits

Author SHA1 Message Date
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
2764db5f4d Caps upgrading on quantum pad 2020-02-08 06:46:27 +10:00
Heroman
3ea943f9ad Sorts vorestation-only rnd recipies 2019-09-26 18:41:54 +10:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Novacat
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -04:00
Unknown
ec19a66eff Conflict Resolution 2019-03-27 16:36:41 -04:00
Unknown
6636f1ba37 Conflict Resolution Part 2 2019-03-27 15:51:05 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Unknown
a4317b1910 [5654] Makes this PR Compile 
This one made me cry.
 2019-02-23 12:30:16 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05: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
Arokha Sieyes
4a5498cfe3 Mostly comment out advanced GPSes 
Fixes #3697
 2018-05-17 15:38:07 -04:00
Arokha Sieyes
97c386df17 Fixes qpad deconstruct 
Fixes #3509
 2018-04-20 02:02:06 -04:00
Aronai Sieyes
91b300df54 Merge pull request #3496 from VOREStation/aro-qpads 
Ports /tg/ Quantum Pads
 2018-04-19 19:24:18 -04:00
Arokha Sieyes
569e8f08c3 Adds Quantum Pads 
Pad-to-pad teleporters, though they cost 75% of a diamond for each one (since they require a bluespace crystal each).
 2018-04-19 18:13:30 -04:00
Leshana
9345d74940 Close infinite bluespace crystal loophole in telesci computer construction. 
Default starting_crystals to zero, if it is ever mapped in the mapper can customize the number, but in-game construction will start with zero.
Also convert New() to initialize.
 2018-04-15 11:56:43 -04:00
Leshana
38f20304ca Initialize procs for virgo 2018-02-03 01:00:57 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Leshana
e644dbe18a Destroy() cleanups in VOREStation code 
* Remove remaining hard del()'s in our code.
* Replace deleted() and gcDestroyed with QDELETED macro.
* Fix some strange calls directly to Del() (capital D)
* Make Destroy() return qdel hints.
* Make a few of the Destroy()'s more comprehensive in cleaning up references.
* In edited Destroy() procs, converted to use qdel_null and qdel_null_list macros when possible for pretty code.
* Removed unused variable `sleevecard`
 2017-06-10 22:44:03 -04:00
Leshana
88f0e65cf9 Converts our own uses of PoolOrNew to use just new() 2017-05-08 21:24:47 -04:00
Leshana
dbdf85b930 Vore mobs were supposed to spit you out when they die. 
* A little typo prevented this! Also it had made an illusory path that was referenced two places; fixed that.
* While we're here, also make it so holocarp don't digest when in safe mode. Fixes #1361  And for them to not try to use vore icons that don't exist for them.
 2017-04-08 13:10:05 -04:00
Arokha Sieyes
a3e5e7327f Initial commit of new map system for Virgo 2017-03-02 23:34:43 -05:00
Arokha Sieyes
440885d1c8 Fix GPS design name 
Oops.
 2017-02-23 18:18:50 -05:00
Leshana
3c33c4ce85 Improve Telescience playability by changing how targeting works, niceness, and FUN. 
* Remove the angle & power mechanic, replacing with simple distance.
* Improve the console interface to update more cleanly, be more clear about what is going on.
* Make it actually possible to insert bluespace crystals.
* Add in possible CONCEQUENCES of failed teleports.
* Make teleports take way more power.
 2017-02-22 21:52:01 -05:00
Leshana
8df2f50f09 Fix resources required to build bluecrystals, used wrong constants. 2017-02-21 14:13:55 -05:00
Leshana
c4377353cb Adds telescience machines and comptuers to the game. 
* Code somewhat ported from /tg, but enhanced with nanoui and /vg's area shielding.
* Telepad - Teleports stuff under control of telescience console
* Telescience Console - Controls the telepad
* Bluespace crystals and GPSs
* Circuits and research designs for all.
 2017-02-21 10:44:21 -05:00
SkyMarshal
efcad9f527 Removal of Telescience. 2014-04-16 20:23:56 -07:00
Iamgoofball
2ec805630e Because we HAVE to define Del() three times 
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
 2014-02-04 11:30:35 -08:00
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2013-12-13 19:13:43 +00:00
Ccomp5950
f7d0d95775 Removed useless sanity check. 
I debugged telesci with a proc that fires the teleport but bypasses all sanity checks and sets target = locate(0,0,0) or null
neither case caused the teleport bugs we are seeing
 2013-12-06 06:03:21 -06:00
Ccomp5950
9a6b4c6a0d Telescience bugfixes 
UI will now update when clicking on stuffs

Added a sanity check to make sure the teleport location isn't 0 or null on all 3 coordinates.
Not sure if this will plug up the random teleporting bug but it can't hurt to have this in there.
 2013-12-06 04:48:02 -06:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev 
Conflicts:
	icons/obj/ammo.dmi
 2013-11-30 05:15:22 +04:00
Iamgoofball
e02566fd2f Changes Telescience to Projectile Trajectory! 
Conflicts:
	code/modules/telesci/gps.dm
	code/modules/telesci/telesci_computer.dm
 2013-11-28 17:50:09 +04:00
Iamgoofball
c13f57613c Changes Telescience to Projectile Trajectory! 2013-11-19 19:23:51 -08:00
Michael Johnson
bcd140a691 Made the telesci console a proper NanoUI 2013-11-13 08:01:00 -05:00
Iamgoofball
3e02b55386 reduced fizzle chance to 50, it was very common and overrode everything 2013-11-09 22:51:20 -08:00
Iamgoofball
d83c07ca0e Made telescience WORK! 2013-11-09 22:42:54 -08:00
Iamgoofball
9ce90a0f41 Note to self: Remember to push your nerfs next time. 2013-11-06 19:10:35 -08:00
Iamgoofball
ec90e5b3c4 Fixed worldloop issues. 2013-11-04 13:19:26 -08:00
Iamgoofball
ee50a26a6b Removed Fart event, fixed copypasta x999, added the telepads to the machines list. 2013-11-04 13:16:00 -08:00
Iamgoofball
d4fc17c77a Fixes an issue where the teleporter can malfunction while calibrated. 2013-11-04 12:32:10 -08:00
Iamgoofball
cfdb0a65a7 made some stuff sooper dooper hard to get 2013-11-03 22:09:31 -08:00
Iamgoofball
4b6ea531a4 text issue regarding \red. 2013-11-03 22:06:02 -08:00
Iamgoofball
e4a2936e2b Added Telescience! Moves Misc. Research to the spot between the Solars and Xenobio. 2013-11-03 21:49:09 -08:00