Commit Graph

2061 Commits

Author SHA1 Message Date
Rob Nelson
de765116de Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)
2014-04-19 15:58:14 -07:00
d3athrow
008556a561 qdel and Destroy() improvements, now done through objects/items/devices 2014-03-04 20:31:53 -06:00
Rob Nelson
40a6465708 Fuck 2014-02-19 02:21:20 -08:00
Rob Nelson
dcdab7b476 Missing DM script 2014-02-19 02:20:54 -08:00
Rob Nelson
ebec57f142 Add missing sounds, redo biohazard alerts, and station intro. 2014-02-19 02:19:46 -08:00
Rob Nelson
144ebe2a67 VOX: Fuck with echo a bit, vastly improve quality. 2014-02-18 22:08:10 -08:00
Rob Nelson
218414ff83 Add plastic to recycling, make a better way of sorting shit from the line.
AND CHANGE EVERYTHIIIIING
2014-02-07 07:33:48 -08:00
Headshotter
c19d82d6f2 New capacitor sprites
The current capacitor icons suck and lack different sprites for
different tiers (basic, adv, super).

The new ones I made look more like capacitors and have a different
sprite for each level.
2014-01-31 20:52:58 -02:00
Rob Nelson
4785c7f0a3 Added Dionae, god help us. 2014-01-24 01:35:23 -08:00
Rob Nelson
41b3da12dc Add "or" and "vampire(s)" to VOX. 2014-01-05 10:14:29 -08:00
Rob Nelson
60f87bbc82 Wire hacking recode from /tg/. 2014-01-04 19:39:36 -08:00
Rob Nelson
a1ac1d9bc5 Imported robot fixes from bay, old/vg/ floorbot fixes. 2014-01-03 16:54:35 -08:00
Rob Nelson
a15262abce Fix #341, update VOX sounds. 2014-01-03 09:55:23 -08:00
Rob Nelson
0709a5d48e Clean up research values, separate job objective goal_level from max_level. 2013-12-28 11:56:35 -08:00
VelardAmakar
8e5410a557 Added seeds for Ambrosia Cruciatus, a vicious plant with a nasty neurotoxin for traitor botanists. 2013-12-15 22:31:34 -05:00
Rob Nelson
16ac17f884 DNA modifiers work now. 2013-11-29 15:29:27 -08:00
Rob Nelson
663b250b1c Fix compile, halfway through refactoring recycling. 2013-11-21 11:00:49 -08:00
Rob Nelson
97f7ff2441 Some new words. 2013-11-08 10:02:08 -08:00
Rob Nelson
1447ab3a1f Add kitchen, qm, chef(s), and botanist(s). 2013-11-04 20:41:03 -08:00
Rob Nelson
e8b10b9c14 Simplify VOX word defs a bit, add a bunch of new words. 2013-11-04 19:57:41 -08:00
Rob Nelson
e8736e7077 Add words to VOX:
cancer
 dorms
 every
 love
 quarters
 smoke
 vox_420 (smoke weed every day)
 wiggle
2013-11-04 18:42:12 -08:00
Rob Nelson
56cfcf1e6e Merge branch 'Hospitality' of github.com:d3athrow/vgstation13 into Bleeding-Edge
Conflicts:
	code/game/machinery/hydroponics.dm
2013-10-27 15:20:57 -07:00
Rob Nelson
cb3b8c9d29 Figure out max techlevels, make a reference sheet and a tool. 2013-10-21 16:22:38 -07:00
SarahJohnson489
f80c40604a Adds Novaflower Produce Info 2013-10-20 19:55:38 -07:00
SarahJohnson489
4494ef77ca Adds Koibean, novaflower, moonflower, ghost chili seed info. Name error on ghost chilis should be fixed this time. 2013-10-20 19:36:20 -07:00
Rob Nelson
38afe99527 Removed all bass from fem_vox for understandability. 2013-09-30 13:48:04 -07:00
Rob Nelson
bfdd39faa7 Fix some buggy pronunciation. "Cyborg" still sounds like "cyborged", but I'm not sure I can fix that. 2013-09-30 13:16:31 -07:00
Rob Nelson
2ac0ef483a Forcing recompile. 2013-09-24 21:29:38 -07:00
Rob Nelson
54df333331 Add Update(d|ing) to wordlist. 2013-09-23 09:07:38 -07:00
d3athrow
f7042bc3c0 Powergloves, zap mothafucka 2013-09-22 15:34:03 -05:00
Rob Nelson
c63be7887f Add some new words, fix pronunciations. 2013-09-20 11:38:30 -07:00
Rob Nelson
af334e386e Whoops, didn't update vox_sounds.dm 2013-09-19 16:22:26 -07:00
Rob Nelson
eb611efa3a Missed a few preexisting sounds. 2013-09-18 10:05:55 -07:00
Rob Nelson
cbb006d332 VOX female voice added. 2013-09-18 09:41:47 -07:00
d3athrow
86c68116f5 Fixes proximity signs 2013-09-16 02:25:24 -05:00
d3athrow
7b460c7db9 Adds basic information to seed packets when examined 2013-09-14 07:30:33 -05:00
Rob Nelson
0f05787f84 Fixes for BYOND 500 2013-09-13 06:36:19 -07:00
d3athrow
049c4aac45 uses the minds assigned_role instead of the mobs job as that's more likely to persist after death. 2013-09-11 00:27:33 -05:00
d3athrow
d7bd742988 Adds a proximity mine wet floor sign for janitor. 2013-09-09 01:09:18 -05:00
d3athrow
165c8ab75d Commiting what i've got so far for the new traitor items 2013-09-06 23:24:23 -05:00
Rob Nelson
1273d06df5 Combine a shitload of strings. 2013-09-04 13:17:54 -07:00
Rob Nelson
2b77203275 ** WILL NOT COMPILE, OVER STRINGS LIMIT **
Import new bay stuff.
2013-09-03 23:19:24 -07:00
Rob Nelson
692d673dc9 Recycling Added, and fixed some admin things.
+ Bomb-deletion-related stuff, which was removed for some fucking reason.
 + Added recycling machines
 + Added recycling procs to atoms
 + Restructured disposals for a proper recycling plant.
 + Fixed a few typos I noticed.
2013-08-21 21:26:01 -07:00
d3athrow
135cebf815 Adding new traitor item, camera bugs and a handheld tv. Screw open a camera and place bug inside for later viewing. Removal: screw open camera and crowbar that fucker out.
Added state laws verb for robutts
2013-07-04 13:07:03 -05:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...")
Signed-off-by: Furlucis <Logman115@gmail.com>
2013-06-11 15:01:48 -04:00
NerdyBoy1104
390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
Cael_Aislinn
6918fb0ef9 new crew manifest for id computers, tweaks to manifest to better fit window, renamed roboticist alt title post-feedback
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 12:56:57 +10: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