Commit Graph

10534 Commits

Author SHA1 Message Date
Zuhayr
a63b9b4e73 Beginning to port over new icon update from limbs branch. WIP 2015-03-24 23:48:54 +10:30
Zuhayr
b9072baa97 Merge with dev. 2015-03-24 14:41:07 +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
Zuhayr
1474c6fdd1 Merge pull request #8574 from PsiOmegaDelta/AIDel
Deletes AI eye along with the AI.
2015-03-23 10:54:36 +10:30
Chinsky
f4dd077d50 Merge pull request #8571 from PsiOmegaDelta/EyeFix
Fixes #8534.
2015-03-22 21:47:17 +03:00
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
8791c2bf1e Fixing a typo.
! and ~ both compile. Feh.
2015-03-23 00:05:29 +10:30
Zuhayr
9deebbf9f6 Vines should now respect coverage and magboots. 2015-03-22 16:25:22 +10:30
Zuhayr
bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30
GinjaNinja32
26d878fb02 Move closing bracket outside <i> tag
Opening bracket is outside. Consistency!
2015-03-21 21:08:54 +00:00
Zuhayr
a8f44cae98 Resolving bugs with spawn order and delays. 2015-03-21 11:49:42 +10:30
Zuhayr
d8018db5c9 Finally got things working from vote to roundstart to join to death. 2015-03-21 11:14:59 +10:30
Zuhayr
2c269e5159 More work on Heist. Remapped the Vox shuttle and added a base for it. Tweaked spawn values etc. 2015-03-21 11:13:48 +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
Zuhayr
cd0bf9622d Merge pull request #8557 from Baystation12/dev-freeze
Dev freeze
2015-03-21 11:03:58 +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
Zuhayr
fb52e095d0 Fixes #8543 2015-03-20 12:37:55 +10:30
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
PsiOmega
34a4bb26bd Silicon law management update.
Adds missing Topic/href checks, reducing risk of exploits.
Ensures a silicon cannot get stuck on the second law management page should it suddenly be un-malfed.
Changes Malf definition. This allows borgs to view and state alternative law sets, while disallowing law edits (for as long as they are slaved/not traitors themselves).
2015-03-18 08:17:46 +01:00
MrSnapwalk
9463ab028a Adds Andrewmeythaler's custom item. 2015-03-17 22:19:13 -05:00
Ravensdale
2201ab21d4 Makes radiation shielded an area flag 2015-03-17 18:54:45 -07: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
Zuhayr
ce062881ae Merge pull request #8511 from PsiOmegaDelta/TrackMob
AIs can now use the crew monitor console for tracking.
2015-03-17 23:08:44 +10:30
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
92f53d6b80 Fixes #8478 2015-03-17 20:08:46 +10:30
Zuhayr
033f758abd Fixes #8477 2015-03-17 20:04:07 +10:30
Zuhayr
145b4442e5 Fixes #8388 2015-03-17 19:49:18 +10:30
PsiOmega
f2d3f7833b AIs can now use the crew monitor console for tracking.
Due to balance concerns, the headache of handling fake identities, meta, etc., this only works for crew members with tracking sensors enabled.
2015-03-17 10:11:18 +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
7cbe2c94fb Fixes #8388 2015-03-17 19:19:28 +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
158a2731e3 Merge pull request #8335 from GinjaNinja32/reagent_dispenser
Reagent dispenser rework
2015-03-17 10:05:18 +03:00
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
GinjaNinja32
2f4a4a6a6c Remove medicine crate and medicine cartridge crates 2015-03-16 21:24:30 +00:00
GinjaNinja32
458970a617 Merge remote-tracking branch 'upstream/dev' into reagent_dispenser 2015-03-16 21:21:56 +00: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
PsiOmega
172110b582 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-16 12:37:43 +01:00