deb60ae309
Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().
2015-09-24 03:08:28 +01:00
82a79a1705
Merge pull request #11787 from bgobandit/theywanttherandd
...
Adds origin tech values to a lot of items.
2015-09-19 14:20:09 +01:00
aac0dd4d22
Adds origin tech values to a lot of items.
2015-09-14 14:27:01 -04:00
77787688ec
fix
2015-09-13 23:47:03 +03:00
75f2c92ebc
Adds materials to ore
2015-09-13 23:37:13 +03:00
9b668de7bb
Merge remote-tracking branch 'upstream/master' into Impropermaterials
2015-09-13 08:58:40 -04:00
15e50de0fe
Merge pull request #11694 from bear1ake/point-zero
...
Remove a bunch of useless .0 in vars
2015-09-13 21:47:09 +10:00
6c8bb6f518
Merge pull request #11632 from bgobandit/dirtymininglies
...
Fixes asteroid turfs showing up as "mineral deposit."
2015-09-13 21:45:56 +10:00
c52c4a5346
Merge remote-tracking branch 'tgstation/master' into point-zero
...
Conflicts:
code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
89fa65c127
Fixes Consistency Issue with Materials
2015-09-12 03:51:33 -04:00
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
b3b9941432
Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa
...
Conflicts:
code/modules/assembly/flash.dm
2015-09-09 14:04:41 -04:00
161156cffc
Merge pull request #11585 from bgobandit/legitposters
...
Poster changes!
2015-09-09 02:38:56 +03:00
5adb732a66
Changed asteroid plating singularity pull to do nothing.
...
Changed singularity act on asteroid plating to do nothing.:
2015-09-08 15:59:35 +01:00
c74796b317
Fixes asteroid turfs showing up as "mineral deposit."
2015-09-07 10:12:39 -04:00
c5984f4359
Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters
...
Conflicts:
_maps/map_files/MetaStation/MetaStation.v41G.dmm
2015-09-06 13:27:51 -04:00
261494e659
Made some changes and repathing for posters.
2015-09-04 18:30:58 -04:00
df7386a4ec
Assemblies update
2015-09-04 11:22:37 +03:00
d23f2cb622
mats for toolboxes, glasses and flashes; adjusts coin amounts up slightly
2015-08-31 12:14:34 -04:00
084965803a
Circuit boards now give glass, not gold. Adds materials to AI modules and coins.
2015-08-31 09:37:44 -04:00
3f29a9866c
Merge remote-tracking branch 'upstream/master' into qdelFixes
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2015-08-31 08:52:30 +01:00
b9db8ce854
A few qdel fixes.
2015-08-27 13:15:41 +01:00
19947d4fa0
Added qdel(wires) to a bunch of objects Destroy proc.
...
Return ..()
2015-08-27 11:10:58 +01:00
d7eca4f327
Merge pull request #11340 from phil235/CoinFlipThrowFix
...
Fixes the do_after progress bar appearing on a coin when flipping+throwing it
2015-08-27 01:00:01 -05:00
3278a3926b
Merge pull request #11358 from phil235/XenoFeatures1
...
Facehugger inhands, xeno tweaks, and monkey bugfixes
2015-08-26 07:52:31 -05:00
cb1cd5b1e7
Monkey and aliens now all use carbon/examine().
...
Fixes monkeys being able to strip and uncuff people while handcuffed themselves.
Add an inhand sprite for facehuggers (taken from Xhuis) (but they don't appear for large queens, it'd look ugly).
Xenos now regenerate plasma on alien weed even when injured but at half the normal rate.
Moved queen/large/update_icons() to humanoid/update_icons.dm
2015-08-24 17:07:09 +02:00
9cfb246e4f
Removes dirt from walking on tiles
2015-08-24 11:33:52 +03:00
90f54ba95c
Fixes the do_after progress bar appearing on a coin when flipping+throwing it.
2015-08-23 19:34:09 +02:00
271b7344f5
Merge pull request #11045 from KorPhaeron/survivalpod
...
Survivalpod
2015-08-18 20:50:18 +01:00
fece9cf524
I forgot how my own code worked
2015-08-16 10:49:51 -05:00
dcee74e952
Fixed the src.loc stuff
2015-08-15 21:41:19 -05:00
5979ffdec7
Logging Syntax Improvement
2015-08-13 12:14:14 -05:00
691f6fb66d
Surgery & Organs Rework: Phase 2
2015-08-06 09:56:54 +03:00
109cbe7280
Survival Pod
2015-08-05 16:18:14 -05:00
9bc07812e1
Merge pull request #10967 from astralenigma/digfix
...
Digging gets the same progress bar as minning.
2015-08-05 14:35:39 +10:00
d5a88d3f98
Merge pull request #10957 from Core0verload/surgery-organs-implants
...
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
91e3ee3658
Everybody hates my code.
2015-08-02 16:42:07 +01:00
738b72702b
Phil hates semi-colons and parenthesis and has supreme god bug fixer he requires sacrifices.
2015-08-01 20:32:46 +01:00
d686ad3a69
Corrected the copypasta by Phil's wise specifications.
2015-08-01 18:02:32 +01:00
4c0d685d6f
Revert "Added L"
...
This reverts commit d0c0760653
2015-08-01 17:42:19 +01:00
d0c0760653
Added L
2015-08-01 17:41:57 +01:00
f0ebee0467
Digging gets the same progress bar as minning.
...
Fixes #10854
2015-08-01 08:18:33 +01:00
04f7b3f2de
Surgery, Implants and Organs rework: Phase 1
2015-07-31 22:18:31 +03:00
357c595176
Changes the targeting code for hostile animals to be a bit more efficient. AIStatus and stance vars are now only one var. The idle stance is fused with the AI_SLEEP status. hostile/life() now only calls ListTargets() once per cycle (we save a list of targets then use that instead of calling the proc again).
...
Alien animals no longer plant egg/weed when player controlled (even if disconnected).
Created the the proc handle_automated_action() for simple_animals , currently only used by giant spiders and alien animals.
Player controlled hostile animals no longer starts targetting things again when the player disconnects.
2015-07-30 22:26:07 +02:00
198758e52d
Feedback
2015-07-26 20:11:03 +02:00
fa35ae91d7
Allows aliens to mine
2015-07-26 20:01:52 +02:00
34db8dd695
Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
...
Conflicts:
code/game/mecha/equipment/mecha_equipment.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/equipment/weapons/weapons.dm
code/game/mecha/mecha.dm
2015-07-16 13:50:01 +02:00
4688c2c969
Fixes proc arguments
2015-07-15 23:52:35 +02:00
359a270de6
Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
...
Conflicts:
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02:00
a262f9aac7
Attack logging tweaks
...
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.
Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.
All attack logging *should* happen AFTER damage is applied now.
Removed the confusing attack entry for when a changeling stings another changeling.
Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
xxalpha