PsiOmega
f25e8a7a67
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
2015-06-26 20:28:47 +02:00
PsiOmegaDelta
203f1b321a
Fixes missing camera c_tag.
...
Prevents the camera from showing up as an invalid null entry in the camera console list.
2015-06-25 10:11:25 +02:00
PsiOmegaDelta
9698def0e7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/nano/modules/human_appearance.dm
2015-06-22 16:59:19 +02:00
Zuhayr
e18966cbf6
Fixes #9887
2015-06-22 22:03:40 +09:30
Zuhayr
7473d18ecb
Merge pull request #9795 from hockeygoalie5/iaasuit
...
Internal Affairs Hardsuit (and a new pen!)
2015-06-21 13:24:13 +09:30
PsiOmegaDelta
405131a54e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/projectiles/guns/projectile/pistol.dm
code/modules/projectiles/guns/projectile/revolver.dm
2015-06-20 20:40:06 +02:00
Mustafa Kalash
eabb051e5d
Fixes exodus-1.dmm
2015-06-20 14:38:56 -04:00
Mustafa Kalash
c114190660
Mapmerge
2015-06-20 14:28:15 -04:00
Mustafa Kalash
ac032f70fc
Changes the module from a watch to the horrible tie. Renames module to augmented tie. Moves module to the ERT ready room.
2015-06-20 14:26:37 -04:00
Mustafa Kalash
bb370a66f3
Merge remote-tracking branch 'upstream/dev' into iaasuit
2015-06-20 14:07:44 -04:00
PsiOmegaDelta
7cac6b57b9
Restores the missing vault camera.
...
Fixes #9842 .
2015-06-17 11:03:53 +02:00
PsiOmegaDelta
772488fadc
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/setup.dm
maps/exodus-1.dmm
maps/exodus-5.dmm
2015-06-17 09:33:34 +02:00
mwerezak
3715fafae3
Makes certain brig counters steel, fixes missing HOP office tables, changes CMO office tables to glass.
2015-06-16 19:17:30 -04:00
PsiOmegaDelta
135d0fb515
Map tweaks.
...
Secure windoors now all use the pre-defined direction instances.
Replaces all border emergency shutters with the base variant because they have become mixed, unmatched, and are generally inconsistent in their use (understandable seeing as we don't have border icons).
Rotates the fore bridge blast doors 90 degrees.
2015-06-15 09:08:34 +02:00
mwerezak
f2f05a0336
Tables on other zlevels
2015-06-14 15:22:22 -04:00
mwerezak
dec1461f6c
Fixes chair preview icon
2015-06-14 14:55:04 -04:00
mwerezak
45772952d2
Fixes engineering stacks having only 1 sheet, adds more plastic
...
Workshop now starts with 3x50 steel sheets, 3x50 glass sheets, 2x50
plastic sheets, and 3x10 plasteel sheets.
2015-06-14 14:45:11 -04:00
mwerezak
921d68f353
Glass tables, padded stools
...
Adds glass tables to chemistry, virology, and HOP's office. Replaces
stools with padded stools in various places around medbay and research
2015-06-14 14:21:55 -04:00
mwerezak
0d6dfd899a
Makes standard tables plastic
...
Makes standard tables plastic, readds steel tables to various places,
mainly around engineering and maintenance. Makes shuttle tables
reinforced.
2015-06-14 13:38:56 -04:00
Mustafa Kalash
cc56480f99
Adds an Internal Affairs hardsuit; adds a mounted pen, stamp, paper dispenser, and flash; maps in the IA hardsuit; and adds a pen which can cycle through the three colors.
2015-06-11 23:31:25 -04:00
PsiOmegaDelta
81ee9178bd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-08 09:57:33 +02:00
Atlantis
41d4c2eb13
Refactors /obj/item/apc_frame to /obj/item/frame/apc
...
- This fixes broken APC frame placement on walls - #9537
2015-06-07 06:26:10 +02:00
GinjaNinja32
63ea8338fb
Merge remote-tracking branch 'upstream/dev' into span_class=notice
...
Conflicts:
code/ZAS/Diagnostic.dm
code/game/machinery/computer3/laptop.dm
code/game/machinery/requests_console.dm
code/game/objects/items/stacks/tiles/plasteel.dm
2015-06-05 00:49:13 +01:00
PsiOmegaDelta
bb1dbe9f67
Merge pull request #9656 from Techhead0/requestConsole
...
Request Console cleanup.
2015-06-04 08:01:13 +02:00
Techhead0
0195c179ff
Request Console cleanup.
...
Changes screen and departmentType to use defines and bitflags instead of magic numbers.
Moves code from the message sender to send_rc_message().
One console's destruction no longer prevents the entire department from receiving messages.
2015-06-03 22:38:04 -04:00
Zuhayr
ebe62cefd8
Refactored random map generator system and added several terrain generators.
...
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
2015-06-03 04:36:19 +09:30
GinjaNinja32
314a28fa75
Merge remote-tracking branch 'upstream/dev' into span_class=notice
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/OpTable.dm
code/game/machinery/floodlight.dm
code/game/machinery/spaceheater.dm
2015-06-02 17:33:20 +01:00
PsiOmega
3d49ad3927
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/jobs/job/job.dm
code/game/jobs/job/silicon.dm
code/game/objects/items/weapons/surgery_tools.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
code/modules/organs/organ_external.dm
icons/obj/objects.dmi
2015-06-01 09:07:03 +02:00
Chinsky
ff592c751a
Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
...
End game tweaks
2015-05-31 23:55:08 +03:00
Chinsky
10218eb8c9
Merge pull request #9573 from Zuhayr/chairs
...
Chair update.
2015-05-31 11:33:24 +03:00
PsiOmegaDelta
cc137738ad
Merge pull request #9590 from Zuhayr/dev-freeze
...
Fixes
2015-05-30 23:20:49 +02:00
PsiOmega
9148d593e2
Fixes #9592 .
...
Re-adds phoron stacks:
1x25 sheets in the engineering storage.
1x5 sheets in xenobiology.
6x1 sheets in chemistry.
Re-adds reinforced glass stacks.
1x1 in locker room maintenance.
2015-05-30 21:23:35 +02:00
Zuhayr
b3102824a0
Fixes #9544
2015-05-31 03:56:06 +09:30
GinjaNinja32
73a746e455
Non-code .dm files with escapes
2015-05-30 14:12:26 +01:00
PsiOmega
bf27545841
End game turf changes now simply alters color.
2015-05-29 23:38:09 +02:00
Zuhayr
3cf0018fb8
Fixing up bed icons etc.
2015-05-30 01:13:11 +09:30
Zuhayr
28265a3e2e
Merge pull request #9457 from atlantiscze/satellite-solars
...
Telecommunications Solar Arrays
2015-05-28 11:34:09 +09:30
PsiOmega
228000d9cc
Marks the engine room, AI, and asteroid shuttle APCs as critical.
2015-05-26 13:26:42 +02:00
Kelenius
0bdc7fe306
Moves spare ID to the table
2015-05-26 13:11:31 +03:00
Atlantis
2f74a6d3c2
Telecommunications Solar Arrays
...
- Makes telecommunications solars actually work. They are connected into ring-shaped cable running around whole telecomms, powering single SMES unit which in turn powers the satellite itself.
- Installed solars have maximal combined output of 240kW. Real output fluctuates between 120kW and 160kW depending on star orientation.
- Fractal generator and relevant breaker removed. RCON control is still possible, by adjusting SMES settings.
2015-05-25 06:18:10 +02:00
mwerezak
02dafb3c71
Adds a bunch of traps to the skipjack equipment
2015-05-24 16:44:35 -04:00
PsiOmega
a294ce9128
Adds additional missing materials:
...
EVA again has:
3x50 sheets of steel.
1x10 sheets of plasteel
1x50 sheets of glass
1x50 sheets of reinforced glass.
Robotics again has:
5x50 sheets of metal.
1x20 sheets of glass.
1x10 sheets of plasteel.
Cargo again has:
1x50 sheets of metal.
1x50 sheets of glass.
2015-05-23 12:49:58 +02:00
PsiOmega
3837e67f70
Fixes #9054 .
...
Seeing how xenobiology is separated from the rest of the station, the Research disposal unit now leaves its goods in the main research hallway.
2015-05-22 11:40:57 +02:00
PsiOmega
38fbe15f5a
Fixes #9265 .
...
Now either engineering or atmos techs can utilize the windoors.
2015-05-22 09:47:52 +02:00
PsiOmega
3d12ad3ab0
Fixes #9359 .
...
While I'm at it.
2015-05-22 09:44:27 +02:00
PsiOmega
e9abad5c70
Restores missing materiel in engineering.
...
The engineering workshop now again contains:
3 sheets of steel, 50 units ea.
3 sheets of glass, 50 units ea.
3 sheets of plasteel, 10 units ea.
1 sheet of plastic, 20 units.
2015-05-22 09:41:07 +02:00
Zuhayr
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
Chinsky
8e5f5ef8e0
Merge pull request #9165 from Yoshax/trapping
...
Makes bear traps do damage when stepped on
2015-05-19 01:43:05 +03:00
Zuhayr
8ce787ef68
Final tweaks to recipe availability and material inheritance.
2015-05-17 18:22:21 +09:30
Zuhayr
a540e97e1b
Stool and table tweaks, adjusted tables on the map.
2015-05-17 13:41:22 +09:30
