Commit Graph

5122 Commits

Author SHA1 Message Date
Zuhayr
bb2cd41c8c Fixed up gibbing and organ icons. 2015-03-26 00:40:59 +10:30
Zuhayr
9c92d3851a Got various kinds of limb loss plus dislocation working. 2015-03-25 23:11:00 +10:30
Zuhayr
97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
Zuhayr
f017764e64 More work on adjusting/tweaking/fixing the limb port to make it functional. 2015-03-25 00:59:17 +10:30
Zuhayr
3fe4162719 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-25 00:29:59 +10:30
Zuhayr
a63b9b4e73 Beginning to port over new icon update from limbs branch. WIP 2015-03-24 23:48:54 +10:30
PsiOmegaDelta
89965420bb Merge pull request #8603 from Baystation12/dev-freeze
Dev freeze
2015-03-24 14:00:57 +01:00
Zuhayr
b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
Zuhayr
a57ba2e26b Fixes #8589 2015-03-24 12:39:55 +10:30
Zuhayr
14950a7e3a Merge pull request #8584 from Kelenius/ofBorgsAndGlass
Fixed construction borg's Rglass
2015-03-23 21:34:36 +10:30
PsiOmega
2a17d656f2 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-23 11:47:15 +01:00
PsiOmega
1908ba59e2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 11:45:32 +01:00
Kelenius
026ec265d4 Fixed construction borg's Rglass 2015-03-23 12:11:58 +03:00
Zuhayr
1474c6fdd1 Merge pull request #8574 from PsiOmegaDelta/AIDel
Deletes AI eye along with the AI.
2015-03-23 10:54:36 +10:30
PsiOmega
767f4dd537 Deletes AI eye along with the AI. 2015-03-22 18:51:15 +01:00
PsiOmega
f9b8c2dbc9 Fixes #8534.
Sets icontype to its proper value.
2015-03-22 16:25:24 +01:00
Zuhayr
a8f44cae98 Resolving bugs with spawn order and delays. 2015-03-21 11:49:42 +10:30
Zuhayr
8d698f0c06 First pass on making heist a pirate mode (human based) 2015-03-21 11:13:05 +10:30
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
GinjaNinja32
04640eafb1 Fix issues with skill class procs 2015-03-20 22:47:51 +00:00
PsiOmega
7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
PsiOmega
1f5de7f64f Ports /tg/ & Paradise ghost sight.
Ghosts can now toggle darkness and seeing ghostly things independently.
Includes some extra work to allow observers to see AI eyes while (mostly) preventing cultists from doing the same.
2015-03-19 16:14:02 +01:00
PsiOmegaDelta
48dce2d1fe Merge pull request #8507 from Techhead0/firepat2
Can pat burning mobs to put them out.
2015-03-17 16:35:14 +01:00
Chinsky
d2518798ec Merge pull request #8486 from PsiOmegaDelta/NanoLaws
NanoUI - Silicon law manager
2015-03-17 14:24:30 +03:00
Chinsky
d3b202db4d Merge pull request #8512 from Zuhayr/dev-freeze
Fixes.
2015-03-17 14:19:59 +03:00
Techhead0
7de83ec6b0 Can pat burning mobs to put them out.
Click on them with help intent to do so. This has a mild chance of
lighting you on fire yourself. If you're already doused in fuel, this is
guaranteed. Also, burning people can set others on fire by hugging them.

Now with improved if(do_mob)
2015-03-17 07:13:48 -04:00
PsiOmega
934de7eb37 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-17 12:03:34 +01:00
PsiOmega
018bd4ebdd Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-17 12:01:09 +01:00
PsiOmega
9d2ba41a3a Ghosts with antagHUD enabled can now see AI/borg laws on examine. 2015-03-17 11:39:22 +01:00
Zuhayr
beaba0b88f Fixes #8440 2015-03-17 19:35:25 +10:30
Zuhayr
b766f9efcf Fixes #8378 2015-03-17 19:20:33 +10:30
Zuhayr
0267f156b5 Fixes #8446 2015-03-17 19:17:36 +10:30
Zuhayr
1f1fe76ec6 Fixes #8495 2015-03-17 19:16:56 +10:30
Chinsky
376657bdd7 Merge pull request #8353 from Glloyd/goonschedu
Goon Process Scheduler for BS12
2015-03-17 10:04:21 +03:00
PsiOmega
7f68403ae4 NanoUI - Silicon law manager
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
PsiOmega
cfb3bad3e2 Fixes #8498.
Simple animals should now die properly when killed.
2015-03-16 13:46:08 +01:00
PsiOmega
a1cbc80ed3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-16 12:39:32 +01:00
Graham Lloyd
207a04a428 fixes the issue brought up on the PR. 2015-03-14 19:14:31 -04:00
PsiOmegaDelta
2925a296dc Merge pull request #8470 from Neerti/3-13-2015_borg_hotkeys
Ports /tg/'s Cyborg Hotkeys
2015-03-14 19:04:36 +01:00
mwerezak
e6e0c87062 Aggressive grab auto hit only applies to close targets and melee attacks 2015-03-14 01:53:11 -04:00
mwerezak
812ff9869d Implements projectile point blank damage multipliers for targets being grabbed. 2015-03-14 00:41:55 -04:00
Neerti
dc4d149832 Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys. 2015-03-13 21:41:23 -04:00
mwerezak
6a5dd6c89e Aggressive grabs prevent missing with weapons 2015-03-13 21:30:18 -04:00
PsiOmega
190bff8b47 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-13 14:23:00 +01:00
PsiOmega
ac25b0a614 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-13 14:21:38 +01:00
PsiOmega
2efa9c78f0 Corrects pulling icon_states. 2015-03-13 11:02:18 +01:00
PsiOmega
fac4eb08e3 Alarm subsystem is now processed by the scheduler. Removes now dead code. 2015-03-13 10:36:47 +01:00
PsiOmega
ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm
2015-03-13 09:23:26 +01:00
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
Zuhayr
b5419a1673 Merge pull request #8443 from Baystation12/master
Master into dev-freeze.
2015-03-11 19:37:19 +10:30