Commit Graph

5139 Commits

Author SHA1 Message Date
Kelenius
24ef7752cd Merge branch 'Baystation12/dev' into ofChemistryAndStuff
Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
2015-03-28 19:14:59 +03:00
Kelenius
30c6646671 Separates affect_mob into three procs 2015-03-28 19:01:51 +03:00
Zuhayr
0c3a18b0b6 Merge pull request #8380 from volas/sanitize_procs
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
Chinsky
aed4156a77 Merge pull request #8587 from PsiOmegaDelta/EyeRefactoring
Refactoring of the AI eye code.
2015-03-27 11:03:15 +03:00
Zuhayr
c0887333bc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-03-27 11:13:53 +10:30
Zuhayr
dda3fc8f02 Merge pull request #8469 from mwerezak/robot-emp
Reduces the effect of EMP on robot power cells, some other things
2015-03-26 19:00:39 +10:30
Zuhayr
ff582ff61e Readded Pun Pun. 2015-03-26 16:57:45 +10:30
Zuhayr
f9a1bcd2c5 Moved mob blood overlays to the species datum. 2015-03-26 16:38:24 +10:30
Zuhayr
1d26b6c20b God dammit. 2015-03-26 16:08:51 +10:30
Zuhayr
87f37dbb43 Moves damage masks and damage overlays to species level. 2015-03-26 15:45:47 +10:30
Zuhayr
efa6f0d3c9 Finalized monkey species definitions and icons. 2015-03-26 14:45:41 +10:30
Zuhayr
ba648e3e8d Updated ismonkey(), refactored kitchen spike, refactored plastic flaps. 2015-03-26 12:45:12 +10:30
PsiOmega
9b7834ff7a Refactors the AI eye.
Relocates eye movement to the eye code itself.
Adds a mask that allows any mob able of wearing it direct access to the camera network, as a proof of concept and adminbus.
2015-03-25 18:53:11 +01:00
Kelenius
b4b635f32d Chemistry commit
I messed something in the git
2015-03-25 19:09:10 +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
PsiOmega
bbe5d67e44 Refactors the AI eye.
Now possible to customize chunk obfuscation image per chunk type.
Obfuscation images are stored per type (thus the small datum structure) to reduce memory footprint in the case of multiple chunks using the same image.
2015-03-24 22:07:22 +01:00
Zuhayr
d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
PsiOmegaDelta
89965420bb Merge pull request #8603 from Baystation12/dev-freeze
Dev freeze
2015-03-24 14:00:57 +01:00
PsiOmega
1c3c9ca48d Refactors the AI eye.
Generalizes the visual net containing and updating chunks.
2015-03-24 09:00:48 +01:00
Zuhayr
a57ba2e26b Fixes #8589 2015-03-24 12:39:55 +10:30
PsiOmega
35ba4282a6 Refactors the AI eye.
Generalizes the chunks used by the eye to decide coverage.
2015-03-23 16:12:13 +01:00
PsiOmega
1db2040daa Refactors the AI eye.
Generalizes the eye itself, allowing it to be created and used by any other mob.
2015-03-23 15:21:39 +01: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
mwerezak
ceaa938b89 EMP deals burn instead of brute to silicons, and bypasses robot armour 2015-03-23 02:47:05 -04:00
mwerezak
28df26b36c Reduces the effect of EMP on robot power cells
Temporary fix to resolve #8454
2015-03-23 02:34:17 -04: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
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