Hubblenaut
964e408b36
Line breaks in records\!
2014-05-23 17:58:07 +02:00
Loganbacca
7d75f6432d
Fixed doubled construct spells
...
Constructs were being assigned duplicated spell lists when spawned from soulstones
2014-05-18 19:52:03 +12:00
Zuhayr
1679b4062f
Merge pull request #4985 from jack-fractal/dev
...
Masks of Nar'sie - Testing Version
2014-05-17 14:01:00 +09:30
Mike
1c9a384a8d
Cherrypick from 'ai-alarms'
...
Refactoring and clean-up of alarm code for AI and robots.
2014-05-14 20:20:30 -04:00
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
Zuhayr
ce4f7d4708
Fixes #4979
2014-05-14 17:02:04 +09:30
jack-fractal
1c772ec1ff
- fixing some compile errors and duplication
2014-05-13 20:48:33 -04:00
jack-fractal
1bd866239f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage
...
Conflicts:
code/datums/mind.dm
code/game/gamemodes/cult/runes.dm
code/game/machinery/doors/door.dm
2014-05-13 20:45:05 -04: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
Chinsky
7773de913d
Merge pull request #4970 from Zuhayr/dev
...
More drone fixes.
2014-05-12 20:43:41 +04:00
Ccomp5950
bc21d1734c
Merge pull request #4962 from mwerezak/internal-storage-ground-fix
...
Internal storage fix
2014-05-12 11:41:48 -05:00
Ravensdale
8e15a76da1
Fixes runtime with yellow slime extracts.
2014-05-12 01:15:45 -07:00
Zuhayr
df7a589bd4
Made drone control consoles buildable/researchable.
2014-05-12 14:51:42 +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
Mloc-Hibernia
d1d3620a12
fix another merge issue
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-05-11 13:56:17 +00:00
Mloc-Hibernia
f2924c9f57
Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons
2014-05-11 13:48:51 +00:00
Mloc-Hibernia
f606f35690
fix messy merge resolution
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-05-11 13:26:28 +00:00
Mloc-Hibernia
e3a8d5eb43
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Zuhayr
582a8e817a
Fixes a runtime with drones building lights.
2014-05-11 22:31:27 +09:30
Zuhayr
ff56d3e1bb
Added drone fabricators to the map in their own area. Replaced Vox crossbows with spike throwers.
2014-05-11 21:38:29 +09:30
Zuhayr
84ec5b6849
Merge branch 'weapons' of https://github.com/Zuhayr/Baystation12 into dev
2014-05-11 20:44:25 +09:30
Loganbacca
f32d281132
Compressed matter implanter fix
...
Compressed matter implanters will now correctly remove the compressed item from the game world if it is in an inventory (player or storage container).
2014-05-11 18:30:18 +12:00
Mike
cee43ffbf3
Fixes internal storage on ground
...
Fixes not being able to remove items from internal storage when the
master item is on the ground.
2014-05-10 23:41:48 -04:00
Ccomp5950
699cbbfd96
Merge pull request #4941 from Zuhayr/dev
...
Maintenance drones.
2014-05-10 03:55:21 -05:00
Zuhayr
a68c4e9c55
Fixes #3993
2014-05-10 10:26:05 +09:30
Zuhayr
7ded31ce4c
Merge pull request #4921 from Jarcolr/UnusedIcons
...
Adds 5 satchels for jobs when selecting "satchel" for backpack pref from code
2014-05-10 02:41:57 +09:30
Zuhayr
5e682668b2
Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
2014-05-10 02:10:06 +09:30
Zuhayr
1fc3ecf145
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36
Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.
2014-05-10 01:40:11 +09:30
Zuhayr
8d6b5e6d5c
Fixes #4911
2014-05-10 01:23:29 +09:30
Zuhayr
9f2f5fb488
Fixes #4808
2014-05-10 00:30:03 +09:30
Jarcolr
dd8ce90fa7
Else Ifs
2014-05-09 16:06:44 +03:00
Zuhayr
4d64af69f4
Fixes #4923
2014-05-09 21:29:44 +09:30
Mloc-Argent
2d99a65cdf
Merge remote-tracking branch 'upstream/master' into dev
2014-05-08 19:27:02 +01:00
Chinsky
5a3a32ec02
Merge pull request #4919 from Hubblenaut/paperwork
...
Record Printout Changes and improved Console Interaction
2014-05-08 13:16:20 +04:00
Chinsky
dbc6011018
Merge pull request #4928 from Ccomp5950/bugfixs
...
[Bugfix] Fixes partial prints.
2014-05-08 13:10:48 +04:00
Mloc
fa6e32ca5c
Merge pull request #4922 from mwerezak/power
...
Fixed cell chargers being infinite energy sources.
2014-05-07 21:48:54 +01:00
Mloc-Argent
a2b85c31a4
Merge remote-tracking branch 'upstream/master' into dev
2014-05-07 17:37:29 +01:00
Ccomp5950
b7d455a64b
[Bugfix] Fixes partial prints.
...
Playays will now no longer leave complete prints from touching an item once.
Instead they will leave a partial print, that has a high chance of leaving more and more with each touch.
You have a 1/100 chance of leaving a full set of prints on your first touch.
Fixes #4176
2014-05-07 02:17:08 -05:00
Zuhayr
0d597fe8db
Merge pull request #4912 from Ccomp5950/mentors
...
Adds Mentors.
2014-05-07 10:00:27 +09:30
Zuhayr
a1f6b7a211
Merge pull request #4885 from mwerezak/equipment-fixes
...
Misc Equipment fixes - Mostly hardsuits
2014-05-07 09:59:44 +09:30
Mike
36dbb67ceb
Fixed air alarm heaters using 1000x less power...
...
...than they should. Note that MAX_ENERGY_CHANGE is 1000, so air alarm
heaters will now draw a maximum of 1 kW instead of 1 W, much more
befitting of a heater.
2014-05-06 20:12:40 -04:00
Mike
a538357b3e
Fixed cell chargers being infinite energy sources
2014-05-06 16:43:16 -04:00
Jarcolr
12d2d616c1
5 unique satchels when selecting "satchel"
...
Enabled for RD, Xenobiologist , Scientist, Botanist, Virologist,
Geneticist, Chemist
http://puu.sh/8BqEX.png http://puu.sh/8BriB.png
2014-05-06 16:54:23 +03:00
Hubblenaut
4dbd3252c9
No 'Record Lost' or different records when printing out Medical/Security Records and switching to another record
2014-05-06 05:37:03 +02:00
Hubblenaut
d1d42d7c35
Ability to access Medical Console by clicking it with ID card
2014-05-06 03:59:54 +02:00
Hubblenaut
7908142f16
Adds Station Time to Crew Manifest Printouts
2014-05-06 03:43:10 +02:00
Hubblenaut
0ddba6d771
Adds Crewmember's name to Medical and Security Record Printouts
2014-05-06 03:36:11 +02:00
Hubblenaut
d803f98ec1
Removes 'paper -' prefix from printed crew manifest
2014-05-06 03:20:13 +02:00
Mloc-Argent
6a11ca32f8
Merge remote-tracking branch 'upstream/master' into dev
2014-05-05 22:22:01 +01:00
