42a9032e78
Hive dismantling, build timer, smoker sprite
2015-07-09 10:47:00 +03:00
df83203356
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/hydroponics/seed_mobs.dm
code/modules/materials/materials.dm
2015-07-09 08:45:49 +02:00
3751e1cdbf
Merge pull request #10055 from Zuhayr/dev-freeze
...
Fixes.
2015-07-09 08:35:06 +02:00
14acf43646
Merge pull request #10059 from Baystation12/master
...
Dev-freeze
2015-07-09 08:34:43 +02:00
9d02b41ae7
Emergency workaround for the observer bug.
2015-07-09 11:01:42 +09:30
e37503dedb
Fixes #9965
...
- Hardsuit injectors now only work on carbon-based mobs. This prevents injecting of AIs, Robots and other silicon-based mobs.
2015-07-08 21:44:04 +02:00
f23c2d5e00
Fixes droplimb wound not handling damage type
2015-07-08 15:17:50 -04:00
e4fdf84ef7
Fixes #10054 , fixes some mushroom issues.
2015-07-09 04:25:36 +09:30
550ea5f127
Fixes #9740
2015-07-09 03:40:26 +09:30
76571bf758
Fixes #9646
2015-07-09 03:29:24 +09:30
0f764d8779
Admins will no longer see stars when viewing faxes.
...
If an admin wasn't human / ghosting / or a silicon mob they would see garbled text.
This uses the "force view" setting to 1 bypassing the check.
Fixes #10050
2015-07-08 10:47:22 -04:00
53152abfd9
More sprites, span.
2015-07-08 17:00:09 +03:00
876dde550a
Beekeeping: spans, sprites, wood recipes, fixes
2015-07-08 12:55:55 +03:00
33a6cac0e1
Removes old hives
2015-07-08 12:55:53 +03:00
c5b98782d5
Adds a new type of beehives
...
Needs sprites, and removal of old beehives.
2015-07-08 12:55:37 +03:00
746ac180aa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-08 09:11:47 +02:00
2de04f110d
Merge pull request #10048 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-07-08 09:10:42 +02:00
f1a790f162
Fixes duplicate var definition.
2015-07-08 09:05:55 +02:00
e18472c444
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/datums/ai_laws.dm
code/modules/hydroponics/spreading/spreading.dm
2015-07-08 08:57:48 +02:00
89f93d4aac
Fixes an issue with plants.
2015-07-08 16:08:59 +09:30
8957412826
Custom items default to the inhands of the parent
...
Makes custom items use the inhand states and icons of the parent item
type if inhand states are not present in CUSTOM_ITEM_MOB.
Makes item_icons take precedence over icon_override for inhands only.
2015-07-08 01:39:02 -04:00
91da4afcac
Removes machinedir on in machine_processing.dm and machine_stacking.dm
2015-07-07 18:43:59 -04:00
457987046b
Re-implements world end events as datums.
2015-07-07 23:09:03 +02:00
b8623859b0
Merge pull request #10029 from mwerezak/vines
...
Stops sampling from being a means of fighting vines
2015-07-08 05:50:22 +09:30
aeb15a85be
Adds missing R&D screens. Fixes the employee computer by cheating.
2015-07-07 17:32:59 +02:00
87d4cf4f68
Computers are now overlay based.
...
Computers now use an overlay based system, instead of demanding a full set of icons (on, off, broken) for every different computer.
Partially ports ParadiseSS13/Paradise#1468 which is a port of tgstation/-tg-station#9931 .
2015-07-07 17:23:49 +02:00
ed5a12c2a2
Revert "[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes"
2015-07-07 17:14:42 +02:00
0a4131e9dc
Reduced Hell Universe Lag
...
Based on https://github.com/d3athrow/vgstation13/pull/5273 .
2015-07-07 12:55:39 +02:00
5703fdfe85
Re-implements admin fun events as datums.
2015-07-07 11:19:01 +02:00
64fba0e4d5
Merge pull request #10023 from PsiOmegaDelta/150705-NoClientQdel
...
Removes a qdel(client) call.
2015-07-07 07:54:10 +03:00
62017e7af2
Merge pull request #10008 from mwerezak/custom-item-icons
...
[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes
2015-07-07 06:44:10 +02:00
8062bed76f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-07-07 11:53:33 +08:00
cee5f1a057
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items.dm
2015-07-06 18:33:09 +02:00
eb64e0c5b6
Fixes a bug where mob sees visible message twice
2015-07-06 15:58:31 +03:00
7f24dc948e
Re-implements Admin secrets as datums.
2015-07-06 14:58:27 +02:00
57bdcf43b6
Reworks character creation language selection
2015-07-06 10:07:35 +01:00
8925a5b23e
Stops sampling from being a means of fighting vines
...
Vines can now only be sampled once mature, can only be sampled
periodically, and take less damage from sampling.
2015-07-05 20:59:23 -04:00
f134ef55a1
Merge pull request #10012 from mwerezak/guntweak
...
Shooting and machine/structure penetration tweaks
2015-07-05 22:26:05 +02:00
69168b8b29
Merge pull request #10020 from PsiOmegaDelta/170605-NullSpaceShield
...
qdel shield generators no longer runtime every tick until hard deleted.
2015-07-06 05:54:18 +09:30
2129bf6c2e
Merge pull request #10014 from mwerezak/raider-gear
...
Fixes issues with equipping raiders, raider gun type
2015-07-06 05:48:25 +09:30
0b22c65eca
Merge pull request #10006 from PsiOmegaDelta/150703-Rejuvenate
...
Rejuvenation now clears chemicals in mobs.
2015-07-05 23:08:01 +03:00
d9af4af844
Fixes #10024 .
...
/mob/living/silicon/robot/handle_regular_hud_updates() called handle_regular_hud_updates() and then recursion kept happening.
2015-07-05 21:24:39 +02:00
944b167e10
Removes a qdel(client) call.
...
Clients are not subtypes of datums. The garbage collector does not like this.
2015-07-05 21:01:09 +02:00
0adebcb2bf
Admin secrets refactor.
...
Turns the entries in the secret admin secrets panel into datums, which will make it much easier to add, edit, and remove new entries.
This initial commit only contains an initial proof of concept entry implementation and the supporting code. Next commit will contain all relevant entries.
2015-07-05 20:56:29 +02:00
9468508226
Adds move cooldown for inventory management, clicking on adjacent atoms
2015-07-05 13:10:52 -04:00
d32b58790d
A deleted shield generator no longer runtime every tick until force-deleted.
2015-07-05 17:33:55 +02:00
508827580c
Formatting
2015-07-04 22:39:09 -04:00
c1bbc5c3a6
Fixes issues with raider equipping
...
Fixes raiders not being able to ever spawn with guns that cannot be equipped to the belt, despite those gun types being in the raider_guns list.
Fixes raiders spawning with guns for which they have no ammo.
Fixes taj/unathi raiders having a 2/3 chance of spawning without any shoes.
2015-07-04 16:32:35 -04:00
fad0a712d8
Expands raider gear list
2015-07-04 15:39:31 -04:00
cf5e4a17d6
Adds raider gun type, fixes sawn shotgun inhands
...
Also adds type def to allow spawning sawn shotguns.
2015-07-04 15:39:05 -04:00
Kelenius