cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,790 Commits 10 Branches 0 Tags
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

1051 Commits

Author SHA1 Message Date
Cael_Aislinn
53cfbaa480 tweaked some rust icons 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:22:35 +10:00
Christian Bielert
2a9f199441 Merge pull request #2469 from Uristqwerty/Tubes 
Added: Code and icons for tube-based transportation.
 2013-03-02 09:37:01 -08:00
Uristqwerty
b455c42d96 Added: Code and icons for tube-based transportation. 
Just an additional tool that mappers may find interesting or fun. At the moment, they do not use power or any resources, and there is plenty of room to extend and improve them, but they do work.

The basic tubes will read their directions from icon_state if they aren't specifically specified, so you can just use the built-in option to generate instances from icon states to get all possible tubes.
The tube stations use directions, instead.
 2013-03-02 04:17:58 -05:00
Zuhayr
48fefead00 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:38 -08:00
Zuhayr
ad47e954ce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:19 -08:00
Cael_Aislinn
533794b0db some useability tweaks to atms 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:45:33 +10:00
Cael_Aislinn
4633373d1f fixed an issue with database reconnection 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:23:22 +10:00
Cael_Aislinn
67a4a94896 atm fix mk 2 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:15:17 +10:00
Cael_Aislinn
43ebfd1fdd tweakfixes to finances 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-27 11:55:28 +10:00
cib
26b4deb33f Department accounts are created now and credentials given to heads. 2013-02-27 01:55:18 +01:00
Cael_Aislinn
cfa3916b95 new events (pda spam, trivial and mundane news items, lotto, hacker) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-26 03:02:24 +10:00
Cael_Aislinn
02ace92b04 miscellaneous tweaks to finance machines 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-26 02:59:04 +10:00
Cael_Aislinn
c1eda324b8 inserting cards into atms only wipes the screen if the card is for a different account, cleaned up dme 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:43:52 +10:00
Cael_Aislinn
46ecf43cf9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:40:46 +10:00
Cael_Aislinn
9b8387ac05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:27:44 +10:00
Cael_Aislinn
3fcab3bf19 more changelog, boosted max shield charge rate 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:21:32 +10:00
Cael_Aislinn
5e99633c51 ordinary shield gens are now buildable 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:50:46 +10:00
Cael_Aislinn
a101b51fa0 normal shield gens produce a ring of shields around the machine, renamed file, useability and simplification tweaks to shield gen + cap, fixed some random issues with shields 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:50:34 +10:00
Cael_Aislinn
a77a409a78 tweaks to finances (added feedback to atms, made accounts synced to station account db at round start) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:44:35 +10:00
Cael_Aislinn
a7a0e48d67 compile fixes, tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-24 22:06:36 +10:00
Cael_Aislinn
6ec8669df6 Merge branch 'bleeding-edge-freeze' of github.com:caelaislinn/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm
	icons/obj/device.dmi
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-24 11:18:49 +10:00
Cael_Aislinn
5860b749ae tweaks to eftpos, re-applied mapchanges (eftpos scanners placed in civilian departments, atms placed in main hallways, account databases placed) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-24 11:16:43 +10:00
Cael_Aislinn
ec023cc3f8 tweaks to finances (inc boost to wallet capacity, new sprite for eftpos) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 21:51:29 +10:00
Cael_Aislinn
1469ccb7f9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-23 19:39:05 +10:00
Cael_Aislinn
68abeda762 when players arrive, they are assigned a new account with random starting funds and the info for it is stored in their memory + ID card. id computer can now modify the account number associated with id cards 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 19:38:50 +10:00
cib
8639d00a9d Removed double definition. 2013-02-22 23:13:22 +01:00
Chinsky
cc3d49cf4b Merge pull request #2401 from caelaislinn/bleeding-edge-freeze 
RUST updates, event tweaks, shielding updates
 2013-02-22 07:05:11 -08:00
Cael_Aislinn
8ee5672159 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-22 23:56:38 +10:00
Cael_Aislinn
2c585fbcc4 moved shield files to folder, made circuitry for shielding gens/caps researchable, various tweaks and balances to the research requirements, made shield gens/capacitors orderable via cargo 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 23:49:29 +10:00
cib
961c77e26e Medical side-effects now appear on overdose. 
Also reduced anti-toxins pill amount, because 50 units is way too much for a single pill.
 2013-02-22 14:28:55 +01:00
Cael_Aislinn
4052e98723 made circuitboards for fuel injectors and rust core, made said circuits researchable, miscellaneous tweaks and cleanups 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 22:41:59 +10:00
cib
947d69be69 Removes random side-effects being caused by most medicine. 
Cryo and cloning will still cause it.
 2013-02-22 13:33:49 +01:00
Cael_Aislinn
66b04ccf1d made circuits to construct RUST computers researchable, made circuits to construct wall mounted RUST machinery researchable, made other RUST machinery orderable via QM 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 20:00:05 +10:00
Cael_Aislinn
7f9c95526d consolidated icons 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 19:51:28 +10:00
Cael_Aislinn
d477b7230f reworked rust components to integrate more smoothly with each other, cleaned up a bunch of useability issues, made all relevant components portable, fixed some random bugs, added a mostly nonfunctional map to show an example layout (based on antiqua's engineering layout) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-22 16:39:42 +10:00
Chinsky
6015df7178 Tweaks to side effects. 
Removed itch one. Caused lots of whining, since it's quite counterintuitive to take drugs to treat itch instead of scratching it or removing bandage.
Made side effects contracting probability-based, probability higher the stronger chemical is.
 2013-02-20 20:00:01 +04:00
Cael_Aislinn
fea6635060 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/game/verbs/who.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-18 01:25:47 +10:00
cib
eaa8130672 Balance fixes to medical side-effects. 
- Bandage/ointment now causes itch instead of cramps
- Reduced amount of messages/effects by side-effects to 1/3
- Side-effects will now disappear after a while if left untreated, but they will cause damage before that.
 2013-02-15 14:25:11 +01:00
cib
31cd43945d Added various new side effects: 
- Headache triggered by bicaridine, alkysine and cryoxadone, treated with tramadol or alkysine
- Cramps triggered by bandages and ointment, treated with inaprovaline
- Bad stomach, triggered by dermaline, kelatone or being cloned, treated with anti-toxin
 2013-02-12 18:20:57 +01:00
cib
cf56a206b3 Medical side effects confirmed to work now. 2013-02-12 17:50:06 +01:00
cib
7a0c37867a Adjusted medical side effect strength. 2013-02-12 17:14:10 +01:00
cib
3f04c7ae99 Bugfix for medical side effects. 2013-02-12 16:38:44 +01:00
cib
1648c69f9d Implemented medical side-effects. 2013-02-12 16:19:39 +01:00
Cael_Aislinn
b63bc43820 new sprites, reworked digspite spawning and geosamples to fit artifacts, misc tweaks (admin logging on syndie beacon, energy field) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-12 22:55:07 +10:00
Cael_Aislinn
c490357f4a tweaks to a couple of random events, removed spider infestation and alien infestation from random list 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-09 01:11:36 +10:00
Cael_Aislinn
06809c3651 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/controllers/master_controller.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-01 23:45:13 +10:00
Whitellama
5d090b0611 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into guntest 
Conflicts:
	code/WorkInProgress/Cib/amorph/amorph_hud.dm
	code/game/objects/structures/window.dm
	code/modules/mob/living/blob/blob.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/screen.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	maps/tgstation.2.0.9.1.dmm
 2013-01-31 14:26:58 -08:00
Cael_Aislinn
7f05c6fdb3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/hud.dm
	html/changelog.html
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 01:02:27 +10:00
Cael_Aislinn
104bc8dd98 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/datums/supplypacks.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:48:07 +10:00
Cael_Aislinn
bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-23 00:23:37 +10:00