Commit Graph

12804 Commits

Author SHA1 Message Date
Hubblenaut
52a9f0eb8e Huge code cleanup and bugfixes, slight overlay modifications 2014-05-23 22:05:13 +02:00
Hubblenaut
b54bc552e7 Personal closets are resettable with verb 'Reset Lock' 2014-05-20 01:25:06 +02:00
Hubblenaut
81b73357a6 Fixes typo in code 2014-05-20 00:28:54 +02:00
Hubblenaut
a5b306ea70 Copies tiny icon of photos accordingly 2014-05-20 00:02:31 +02:00
Hubblenaut
40c90a88d6 Removes name prefix of renamed photos 2014-05-19 23:41:53 +02:00
Hubblenaut
7eb6f83932 Removing name prefix of cabinet-generated paper 2014-05-19 23:38:54 +02:00
Hubblenaut
66052c6eba Merge branch 'paperbundle' into dev 2014-05-16 03:50:10 +02:00
Hubblenaut
ee22d0558b Anyone who cannot read a paper is not able to read a bundle either 2014-05-16 00:05:21 +02:00
Hubblenaut
42ab7e2b00 Makes photos visible on bundles 2014-05-15 22:21:11 +02:00
Zuhayr
cee5f92bcf Merge pull request #4986 from Intercross21/dev
Now you can set ZAS/Plasma settings to initial
2014-05-15 14:07:24 +09:30
Mloc-Argent
e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
2014-05-14 22:42:03 +01:00
Intercross21
a704efa3a9 Now variables renamed too. 2014-05-14 16:25:37 +04:00
Chinsky
5af92b2906 Merge pull request #4989 from mwerezak/disease2-runtime
Fixes #4965
2014-05-14 15:01:21 +04:00
Chinsky
98ee34a555 Merge pull request #4990 from Zuhayr/master
Fixes #4810
2014-05-14 15:00:23 +04:00
Chinsky
1c6a8c3a34 Merge pull request #4988 from mwerezak/generator-replacement
Replaces broken generator in eng hard storage
2014-05-14 14:59:24 +04:00
Zuhayr
e26d7fdb6f Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into dev 2014-05-14 17:12:26 +09:30
Zuhayr
be992ab9a7 Fixes drone fabricator runtime. 2014-05-14 17:12:03 +09:30
Zuhayr
ce4f7d4708 Fixes #4979 2014-05-14 17:02:04 +09:30
Mike
4ceada67fd Fixes #4965 2014-05-14 01:15:01 -04:00
Mike
2d2a145907 Replaces broken generator in eng hard storage 2014-05-14 00:47:01 -04:00
Intercross21
9fd94c171e ... 2014-05-14 07:32:01 +04:00
Intercross21
8adef38cc4 Now you can set ZAS/Plasma settings to initial 2014-05-14 07:28:53 +04:00
Chinsky
bb33eddb63 Merge pull request #4978 from Ccomp5950/special-role-color-fix
Removes the special name coloring of those with special roles from inappropriate times.
2014-05-14 03:51:40 +04:00
Chinsky
a3340e797e Merge pull request #4980 from Loganbacca/clickfix
Invulnerable windows fix
2014-05-14 03:51:21 +04:00
Loganbacca
25983be804 Added exception for breaking full tile windows on top of single pane windows 2014-05-13 23:29:11 +12:00
Ccomp5950
a75defd96d Merge pull request #4975 from Zuhayr/nymphs
Added a *chirp sound clip for diona nymphs.
2014-05-12 22:14:20 -05:00
Ccomp5950
76f8a94974 Removes the special name coloring of those with special roles from inappropriate times.
Basically if we don't want a privmsg link we're not going to include the font change as well.  This should fix it from displaying the coloring code in logs and other places not meant to be html (irc bot).
2014-05-12 21:27:02 -05:00
Zuhayr
681c7bbe53 Attempting to fix a bug involving resource stacks failing to appear when used. 2014-05-13 11:47:20 +09:30
Ccomp5950
5a1ab29c2a Merge pull request #4974 from Zuhayr/dev
More more drone fixes.
2014-05-12 20:26:05 -05:00
bs12-bot
1f614c3149 Merge pull request #4971 from Ravensdale/and_yeah_he_doth_spake-let_there_be_light
Fixes runtime with yellow slime extracts.
2014-05-12 19:02:31 +01:00
Zuhayr
2998ab3bd1 Adds inter-drone speak at close range (say) 2014-05-13 02:24:56 +09:30
Chinsky
7773de913d Merge pull request #4970 from Zuhayr/dev
More drone fixes.
2014-05-12 20:43:41 +04:00
Ccomp5950
cc615ee06d Merge pull request #4963 from mwerezak/accessory-fix
Accessories
2014-05-12 11:43:05 -05:00
Zuhayr
7bab9aea47 Fixes no cooldown on shutdown drones, adds wood tiles and rglass to drone module, changes how regenerating resources work slightly. 2014-05-13 02:12:05 +09:30
Ccomp5950
bc21d1734c Merge pull request #4962 from mwerezak/internal-storage-ground-fix
Internal storage fix
2014-05-12 11:41:48 -05:00
Ccomp5950
08687ecfde Merge pull request #4966 from Loganbacca/bayfix
Compressed matter implanter fix
2014-05-12 11:40:31 -05:00
Ravensdale
8e15a76da1 Fixes runtime with yellow slime extracts. 2014-05-12 01:15:45 -07:00
Zuhayr
1dd7f0db96 Added a *chirp sound for diona nymphs. 2014-05-12 16:26:21 +09:30
Zuhayr
a819477e55 Allowed drones to decompile dead but not gibbed clientless drones. 2014-05-12 16:12:59 +09:30
Zuhayr
d3f1731c00 Simplified robot repairs a lot for drones. No more organ damage for them. 2014-05-12 16:01:39 +09:30
Zuhayr
7574e99acd Added a cooldown to CLONG CLONG from moving in disposals. 2014-05-12 15:00:52 +09:30
Zuhayr
590f980ea9 Allowed magnetic grippers to remove APC cells. 2014-05-12 14:51:55 +09:30
Zuhayr
df7a589bd4 Made drone control consoles buildable/researchable. 2014-05-12 14:51:42 +09:30
Zuhayr
c2616e3744 Fixes lack of update on drone fabricator console. 2014-05-12 13:18:52 +09:30
Zuhayr
4da14198cf Stops drones from self-destructing or being locked down by the RD console. 2014-05-12 13:06:18 +09:30
Zuhayr
b6a3c8a761 Fixes drone regeneration of materials issue. 2014-05-12 13:00:25 +09:30
Zuhayr
e0063c271b Fixes 'resource depleted' error for emagged drones. 2014-05-12 12:51:43 +09:30
Zuhayr
10ebe3b8b2 Fixes the decompiler. Adds spiderlings, broken globes, mice and lizards as valid targets. 2014-05-12 12:42:09 +09:30
Zuhayr
5295b9ee2e Readds drone held icon that got lost somewhere in merges. 2014-05-12 12:17:11 +09:30
Mloc-Hibernia
d1d3620a12 fix another merge issue
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-05-11 13:56:17 +00:00