cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,692 Commits 73 Branches 18 Tags
99bf59d80ec5bee85291aed6d7afdbc953ab72e8
Commit Graph

28 Commits

Author SHA1 Message Date
PJB3005
99bf59d80e Adds a to_chat() proc, to pave the way to a non shit chat. 2015-11-25 15:55:15 +01:00
PJB3005
3cca5692af Removes the panic writer messages. 2015-11-20 03:17:06 +01:00
D3athrow
d59f6a07b0 comment out panicwriter and saytesting 2015-07-20 16:04:48 -05:00
D3athrow
41d7df01fd just fuck my shit up 2015-07-18 02:30:51 -05:00
D3athrow
01d2471fc9 Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge 
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
 2015-04-12 16:40:59 -05:00
Rob Nelson
b58ebb7310 Add Flo back in. She cute. 2013-08-21 00:02:35 -07:00
d3athrow
25b0261ff4 Fixes liquid fuel not burning up properly. 2013-08-08 17:02:51 -05:00
d3athrow
3bdeba5ac7 Typo fix, retractor step bugfix. 
ZAS fix.  It should now be possible to repair breaches without admin intervention.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Several ZAS fixes.
Adds insulation to doors, modifiable by admins from the ZAS setting panel.
Fixes a logic error with connections.  (I am dumb some days)
Improves the runtime detection and reporting.
Improves "zone info" debug verb.
 2013-07-27 13:39:20 -05:00
d3athrow
7677250bf8 Adjusting fire consumption levels 2013-07-25 03:55:30 -05:00
d3athrow
9aca107200 Overhaul of how fire is handled, this is where a lot of the lag came from. Also the zas neutering things are included. 2013-07-09 04:43:58 -05:00
d3athrow
710f5ed902 upped zas a bit 2013-06-06 02:34:16 -05:00
d3athrow
f85cfe304a Fixed toxins, reference bomb: http://puu.sh/39rQR.png 2013-06-06 02:07:01 -05:00
d3athrow
4c66515b82 Committing icons and code edits first 2013-06-02 14:42:41 -05:00
SkyMarshal
b3f13d4dca Airflow now prevents doors being bumped open. 
Plasma settings changed as per Cacophony
Airflow defaults changed as per Cacophony
Plasma now has an effect other than what happens when breathed. (contamination readded)
Washing machines now clean off contamination.
 2013-04-17 01:36:05 -07:00
SkyMarshal
b1e9955ea7 Fire update. Should now burn out after a time, and temperature varies on a number of conditions. Fixed a runtime, and made fire work in canisters. Ingame modification of ZAS is now possible again. Firedoors now remove duplicate firedoors on the same turf. 2013-04-11 11:21:46 -07:00
Cael_Aislinn
31349fb7d3 Merge branch 'incremental_tg' r5067 into bs12_with_tgport 
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)

Conflicts:
	baystation12.dme
	code/__HELPERS/type2type.dm
	code/controllers/configuration.dm
	code/datums/datumvars.dm
	code/datums/helper_datums/getrev.dm
	code/defines/obj.dm
	code/game/gamemodes/events/black_hole.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/turrets.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/turfs/turf.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/holder2.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/assembly/igniter.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/setup.dm
	code/stylesheet.dm
	code/world.dm
	config/admins.txt
	config/config.txt
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
	icons/turf/areas.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-28 14:13:11 +10:00
Cael_Aislinn
e6c70937e5 Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-28 01:07:36 +10:00
SkyMarshal
82ed4f809f Revert "Revert pull request #1605 and #1606 due to temperature bugs killing the crew" since that code did not touch any temperature things, or even any ZAS things and I got no answers even after asking for about 18 hours... 
This reverts commit 5e2f4948d0.
 2012-08-12 18:41:27 -07:00
Albert Iordache
5e2f4948d0 Revert pull request #1605 and #1606 due to temperature bugs killing the crew 2012-08-12 12:17:35 +03:00
SkyMarshal
5140b4e906 ZAS fixes. 2012-08-11 21:22:34 -07:00
SkyMarshal
cf89bbed1b ZAS bugfixes and improvements. Zones will now properly interact with any bordering unsimulated turfs, so Cael can now make his planetary map. Some cleanup to the code, and added scaling and sanity to air movement so that stuff isn't pants on head retarded. 2012-08-11 00:50:19 -07:00
SkyMarshal
4fe2b585a7 Adds further checking and variable presets to ZAS, and made the contamination overlay actually work. 2012-07-24 22:12:25 -07:00
SkyMarshal
6dadde18c3 Improved ZAS plasma setting names and feedback when it is changed. 2012-07-20 13:45:51 -07:00
SkyMarshal
ba75994b29 ZAS updates and possible fixes. Zones will no longer connect to a space tile under a door. Added a secondary airflow value for what can move large objects, like closets. 2012-06-23 17:58:54 -07:00
SkyMarshal
dffed10290 Fixed a long-lasting error with vending machine in toxins, fixed/added atmos setting editor in game. 2012-06-18 23:39:12 -07:00
Aryn
f0f6f14355 Fixed up the errors related to ALL_ITEM_CONTAMINATION and hotspots, made extinguishers work again. 2012-05-27 12:49:26 -06:00
Aryn
6f00258376 I accidentally ALL THE THINGS! But yeah, ZAS is updated. 2012-05-26 02:01:26 -06:00
unknown
a7bce8a609 WHOOPS 
Signed-off-by: unknown <Colm@Blue.(none)>
 2012-03-15 22:52:29 +00:00