Commit Graph

395 Commits

Author SHA1 Message Date
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Loganbacca
18cc00b5c0 Research object update
- Updates research testing object to include phoron and engineering tech
2014-12-04 20:49:43 +13:00
PsiOmega
e98649fa5e Plastique wiring. 2014-11-24 11:21:31 +01:00
Hubblenaut
109ef9ac89 Adds gambling tables 2014-09-28 21:48:57 +02:00
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
GinjaNinja32
05e7c4a07a Moved all shard code to one file. Fixed #5992 2014-08-13 21:05:27 +01:00
Mloc-Argent
d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
PsiOmega
d2cdf01a60 Deluxe soap now has a more pleasant range of smells. 2014-07-17 12:54:51 +02:00
igalan
a27b2ac005 Removed commented out useless crap. 2014-07-11 05:43:59 +01:00
igalan
fc3648a523 Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.
This PR comments out the non-edible one and replaces any reference of it to the edible one.
2014-07-10 22:20:13 +01:00
Chinsky
be95e54e43 Merge branch 'master' into dev
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
mwerezak
6dee9cf65d Adds sharp and edge flags to appropriate items
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
2014-06-16 13:26:44 -04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04:00
igalan
9a27556421 Let's test this rebase thing. 2014-06-14 15:20:25 +01:00
Zuhayr
4244479e43 Reapplying some changes. 2014-06-12 01:23:32 +09:30
igalan
7d08d4701c Hydroponics refactor, part 1: Files.
No code actually modified, just moved from all over the place to a module folder.

defines/obj/hydro.dm split:
-Seeds into seeds.dm
-Tools like the analyzer, pest and weedkillers into hydro_tools.dm. Hatches and scythe from defines/obj/weapon.dm moved there too.
-Non-edible plants like nettles into grown_inedible.dm. Special procs in items/weapons/hydroponics.dm moved there.
-Biogenerator and hydroponics tray files moved.
2014-06-11 03:44:29 +01:00
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev"
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
2014-05-31 00:25:56 +01:00
jack-fractal
1bd866239f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/doors/door.dm
2014-05-13 20:45:05 -04:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Ccomp5950
83ef93c41c Merge pull request #4270 from Baystation12/master
Merge master into Dev
2014-01-11 18:18:03 -08:00
LightningIron
b3bfc9684d Made APC modules cost 50m/50g from autolathe, on par with other engineering modules. 2014-01-10 20:58:20 -06:00
fauxki
4c4aa90b7c Adds the walking cane as a useable wizard's staff. 2013-12-20 16:56:46 -08:00
jack-fractal
5c87c3001a modifying visibility interface of ai to use generic visibility_interface 2013-12-07 16:34:24 -05:00
Mloc
d8683f2d39 Revert "Merge pull request #3965 from jack-fractal/dev"
This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>
2013-11-25 11:59:57 +00:00
jack-fractal
6764c54989 making a generic version of the AI's visibility code so that it can be reused by the Cult Spirits 2013-10-26 16:52:14 -04:00
Segrain
9a662594f2 Cash money. 2013-10-21 05:04:45 +03:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:27:39 +01:00
Zuhayr
50d0c18165 Added a knife harness/duelling knives. 2013-08-08 20:48:54 -07:00
Zuhayr
7cd54ac387 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-12 11:41:08 -07:00
Zuhayr
19748b1217 Added verbs for ripping items out of yourself, added examine proc, altered hatchets w_class. 2013-06-12 03:20:23 -07:00
Zuhayr
7db6cd4108 Added shrapnel from projectile wounds and altered scanner readout. 2013-06-12 01:45:07 -07:00
Zuhayr
0a220db976 Added embedded weapons and adjusted implant removal surgery to work with non-implants in organs. 2013-06-12 00:28:12 -07:00
Chinsky
bd3879da2e Merge pull request #3040 from Baystation12/master
hurka durka master update
2013-06-11 12:25:56 -07:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...")
Signed-off-by: Furlucis <Logman115@gmail.com>
2013-06-11 15:01:48 -04:00
Zuhayr
98d31e9191 Preliminary work for pneumatic cannons (WIP, no sprites, broken gun) 2013-06-10 22:35:01 -07: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
0c2c999f74 money! re-added atms, created account system / accounts database, whole bunch of options for moving money around, some tweaks to spacecash and icons
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-22 17:56:34 +10:00
d_h2005@yahoo.com
e15c63d100 -New chicken sprites! Other minor tweaks to chicken code, slows them down some and notches the lay rate back a bit.
-Fixes invisible cane inhands.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5595 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-21 06:02:30 +00:00
johnsonmt88@gmail.com
1f07f31b64 Grammar fixes for item-suicides.
I got about half-way through changing these when SuperSayu came up and said he fixed this a while ago but never posted the fix. So technically half of these were fixed by me and half by him. Credit to both of us!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5564 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-17 02:52:57 +00:00
petethegoat@gmail.com
4e022a9b45 Recoded the spellbook. Should fix the bug which stopped the staff of animation spawning, and prevent similar bugs in the future.
Moved the spellbook define into spellbook.dm, in the wizard gamemode folder.

Moved the old spells.dm to unused.

Added some new guns to summon guns.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5549 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-14 20:17:04 +00:00
petethegoat@gmail.com
f363948dc6 Committing some of SuperSayu's misc patches: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11671
* Smart fridge smartly shows (x5)(x10)(x25)(All) vend options based on quantity stored
* Gateway fix: When the away mission gate is calibrated, you will come out facing south. Matters somewhat when walking through in an exosuit. Also one pedantic text edit.
* Drink volume estimation:
* * Moved "half-full" to 26%-66% rather than 25%-49%
* * Moved "almost full" to 67%-90% rather than 50%-111% (1/.9)

Also removed /obj/item/weapon/directions and /obj/item/weapon/paperscrap.
They've been replaced by /obj/item/weapon/paper/crumpled and /obj/item/weapon/paper/crumpled/bloody.
Updated 2.1.0 and all away missions.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5497 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 20:58:31 +00:00
johnsonmt88@gmail.com
2c3ae32f04 You can now commit suicide using certain items! There will be more items to come, this really just lays the groundwork.
Credit goes to CodenameB and Spike68 for the original proposed commit. Althought it ended up changing, this commit still uses all of their suicide messages. Thanks to carn for pseudo-coding the base of the system that I ended up using to implement this.

The suicide verb checks the item in your active hand and calls that item's suicide_act(). (/obj/item/proc/suicide_act(mob/user)) The proc displays the suicide message to any viewers and returns a damage type. The suicide verb then applies 175 damage to the mob divided by the number of damage types. If the proc returns null (meaning that the item does not have a suicide_act() defined) the regular suicide occurs.

To any coder wanting to add items to this: 
- You MUST return one or more damage types. "return (BRUTELOSS|FIRELOSS)" for example.
- Please do not manually type in the item's name; use [src] to refrence an it instead. It'll save time down the road if an item gets renamed. It also helps handle any child of that item without copy/pasting the proc to each child.
- Please do not use 'usr' for anything.

Parrots can now see which item they are holding onto in the stat panel.

The toy crossbow should once again work properly. Fixes Issue 1227.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5468 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-05 03:56:24 +00:00
Kortgstation@gmail.com
2003244388 Fixed beartraps instant-killing simple animals (now does 20 damage, enough to kill mice/pets, but not enough to one hit kill an alien empress or something).
Fixed beartraps working on "floating" simple animals (constructs, shades, viscerators)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5444 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-01 08:36:50 +00:00
johnsonmt88@gmail.com
e7ebfae317 Another whack at the defines folder:
Removed defines/obj/toy.dm and moved the defines down to objects/items/toys.dm

Moved a big chunk of defines out of defines/obj/weapon.dm and into their respective .dm files.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5441 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-01 01:25:02 +00:00
d_h2005@yahoo.com
370ab8ebf9 Adds a line of feedback when an antagonist scans an ID with an agent card. The goal of this is to provide helpful feedback to the player without making it easier to metagame.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5417 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-29 05:11:07 +00:00
ericgfwong@hotmail.com
73231b48fb Added access restrictions on the syndie shuttle airlocks and controls.
Only agent cards have access to these equipment.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5404 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-26 22:30:43 +00:00
d_h2005@yahoo.com
87fdadb033 Adds Ricotez's expanded stock-parts sprites.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5295 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-11 04:14:13 +00:00
Aussprites
89f2ee157d Added stuff for christmas. 99% done by Carn all I did was poke around and finish it off. Cracker/gift sprites done by Tanknut.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5292 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-10 05:35:40 +00:00
d_h2005@yahoo.com
57d907f00e Agent cards can copy access levels off other IDs now, removing the need for traitors to carry around their old IDs if they want to get into their own departments - and allows them to copy the access of others subtly.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5260 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-05 16:15:45 +00:00