volas
31360a344b
merge fix
2015-03-25 01:13:23 +03:00
volas
e3d41c3112
Merge remote-tracking branch 'upstream/dev' into sanitize_procs
2015-03-25 01:06:32 +03:00
volas
5fee41d4ba
sanitize() refactor: third pass (misc)
2015-03-25 01:05:21 +03:00
Chinsky
959ee07119
Merge pull request #8607 from Kelenius/ofDrillsAndMiners
...
Updates drill and scanner
2015-03-24 20:05:25 +03:00
Kelenius
78bac425ad
Updates drill and scanner
2015-03-24 18:34:26 +03:00
PsiOmegaDelta
89965420bb
Merge pull request #8603 from Baystation12/dev-freeze
...
Dev freeze
2015-03-24 14:00:57 +01:00
Zuhayr
7e615521ef
Should fix issues with invisible seeds/products/plants.
2015-03-24 13:51:44 +10:30
Zuhayr
45f28d5372
Fixes #8485
2015-03-24 13:20:24 +10:30
Zuhayr
ef50918b9c
Hackfix for #8588
2015-03-24 12:46:07 +10:30
Zuhayr
a57ba2e26b
Fixes #8589
2015-03-24 12:39:55 +10:30
PsiOmega
bd48c76620
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-23 21:14:32 +01:00
PsiOmegaDelta
c85e1ce786
Merge pull request #8592 from comma/maxlen
...
Readded missing check for paper editing
2015-03-23 21:13:43 +01:00
Chinsky
a9ee51bc64
Readded missing check for paper editing
...
Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues.
Thanks @volas for noticing.
2015-03-23 23:02:43 +03:00
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
volas
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +03:00
volas
855755f808
sanitize() refactor: first pass (sanitize)
2015-03-22 23:31:19 +03:00
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
