Commit Graph

1247 Commits

Author SHA1 Message Date
mwerezak
c08774d96e Updates bear traps
Moves to trap.dm.
Cleans up trap attacking code.
Fixes trap remaining anchored once triggered.
Instead of embedding, traps now buckle their victim into place.
Deaf messages, where appropriate.
Gave beartraps a more setting-friendly name.

Conflicts:
	baystation12.dme
2015-05-24 16:33:41 -04:00
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
Chinsky
8e5f5ef8e0 Merge pull request #9165 from Yoshax/trapping
Makes bear traps do damage when stepped on
2015-05-19 01:43:05 +03:00
Zuhayr
a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Yoshax
9bdfeb5ab1 Adds if statement 2015-05-11 13:16:07 +01:00
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Yoshax
cb8a4c7d75 Removes redundant proc call 2015-05-10 22:03:10 +01:00
Yoshax
5ff5214528 Removes redundant var 2015-05-10 20:51:36 +01:00
Yoshax
b0d10a6508 Fixes some stuff (+2 squashed commit)
Squashed commit:

[f63e170] Removes unnecessary /

[ac1b52c] re adds 1 bear trap i somehow accidently removed
2015-05-10 20:43:36 +01:00
Yoshax
86bf94ba07 Refactors bear traps 2015-05-10 20:09:29 +01:00
Yoshax
6c121d232b Makes bear traps do damage when stepped on 2015-05-09 19:57:01 +01:00
Zuhayr
dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
Zuhayr
84302ca204 Chinsky fix ur shit 2015-04-01 08:21:44 -07:00
Chinsky
eb390ffde3 Fixes #8246 2015-03-30 23:20:09 +03:00
mwerezak
3bf5a5ca99 Updates storage costs
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
2015-03-05 10:40:25 -05:00
PsiOmega
b3b7ed06cd Fixes #8234
Updates a few missed containers to use proper paths.
2015-02-24 14:06:23 +01:00
Zuhayr
9c45f000ec Merge with dev. 2015-02-16 20:34:07 +10:30
mwerezak
f8977c65af Much nicer syringe gun implementation
Makes syringe guns a type of launcher gun, and removes the hack
projectile.
Also moves syringe and dart gun source files into the modules/projectile
folder.
2015-02-13 23:48:35 -05:00
Zuhayr
5e87b21d44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-14 09:32:17 +10:30
PsiOmega
d4ae710c0c Tweaks and corrections. 2015-02-12 21:11:38 +01:00
PsiOmega
73bc5934d5 Replaces uplink Donk-pockets with Sin-Pockets.
Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.

Makes the concealed cane use non-del methods.
2015-02-11 09:55:50 +01:00
Zuhayr
08b26e8e4c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-11 14:35:58 +10:30
PsiOmega
3a6c4dacd6 Adds 9mm gun with silencer, 5TC, with the option to acquire additional ammo, 2TC. 2015-02-10 22:39:40 +01:00
PsiOmega
dcb2e22e61 Adds a concealed cane sword for 2 TC. 2015-02-10 22:37:25 +01:00
Kelenius
e6dc9d36fd Update for machine upgrades and some science
Also adds RPED and makes biogenerator and borg charger constructible .
2015-02-08 15:39:11 +03:00
Zuhayr
fdf0360a69 Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP. 2015-02-04 10:55:33 +10:30
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Zuhayr
2ed0e433aa Table/rack refactor. Fixes #7509 2014-12-24 12:14:48 +10:30
Amunak
41d81a14ef Buffed the research testing item, made more clear that it's for testing only. 2014-12-13 07:10:37 +01:00
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
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
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