Commit Graph

11150 Commits

Author SHA1 Message Date
EmperorJon
f7e5c7cd50 Merge pull request #542 from Woodratt/1.3.0_grenades_elevators
1.3.0 of Grenades and Elevators
2015-12-12 15:37:04 +00:00
woodratt
a22195aed3 1.3.0 of Grenades and Elevators
- Explosive grenades have gotten a major upgrade, (borrowed code from fragmentation grenades).
- Box for explosive grenades lowered to 5 grenades per box instead of 7.
- Evidence locker moved to forensics area from detective's office. Body bags, latex gloves, and evidence bags moved to said locker.
- Low yield EMP grenades created including sprites. Box for them created (neither added to the map).
- Can now spawn from the elevator.
2015-12-11 23:05:15 -08:00
Datraen
ef0337fccf Refactors Telecrystals into individual pools, adds a new command to allow for admins to modify telecrystal levels. 2015-12-11 21:14:11 -05:00
EmperorJon
e83f0e6a3f Merge pull request #533 from EmperorJon/11_Dec._Space_base_turf_to_space
Space's default turf is space.
2015-12-11 20:28:30 +00:00
Jon
af14c2d03a Space's default turf is space. You'd think that was pretty clear and easy to remember to do, right?
Wrong. Apparently.
2015-12-11 20:21:26 +00:00
zaredman
8b80ef51ec Merge pull request #529 from Hubblenaut/tape
Fixes doortape using wrong icon - #528
2015-12-11 14:44:24 -05:00
Hubblenaut
de5ca70ddb Fixes doortape using wrong icon 2015-12-11 16:46:13 +01:00
Earthcrusher
77ecd5a24e Adds a price to the new vending machine cigarettes. 2015-12-10 18:58:23 -06:00
Neerti
f28a0405a8 Merge pull request #513 from Hubblenaut/tape
New Police Tape Icons and Placing Algorithms
2015-12-10 19:51:09 -05:00
Neerti
5dbbbaa80b Merge pull request #456 from Zuhayr/master
Porting forensics from Aurora.
2015-12-10 19:50:44 -05:00
Hubblenaut
4c0548b534 Adds directional client support for police tapes 2015-12-10 21:28:21 +01:00
Neerti
a9e7783bcb Merge pull request #511 from Woodratt/1.2.7_map_fixes2
1.2.7 Map Fixes and sprite additions
2015-12-10 13:50:01 -05:00
Neerti
a25c728c07 Merge pull request #509 from Hubblenaut/master
Fixes onmob icons for holders
2015-12-10 13:40:31 -05:00
woodratt
be97cbaf48 1.2.7 Map Fixes and sprite additions
- Soda fountains added to heist base and merc base. Flamethrowers removed.
- Reduced the amount dufflebags can carry to 12 slots
- Additional shuttles added to captain's office, bridge hallway, hop office, engineering engine area, chapel, security restroom.
- Double disposal pipes and atmos pipes removed from several areas.
- Tweaked engineering restroom
- Two communicators added to the map, hotel area and civilian lockeroom.
- Groundwork added for head of staff folders added.
2015-12-10 10:35:38 -08:00
Hubblenaut
d4766aa09a Atmos personal locker spawn with atmos tape roll
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
2015-12-10 19:27:04 +01:00
Hubblenaut
5f28c7cfad Police tape rewrite 2015-12-10 19:25:26 +01:00
Hubblenaut
9980b7ef13 Fixes onmob icons for holders 2015-12-10 19:17:13 +01:00
Neerti
ef5c20f9b3 Merge pull request #506 from Hubblenaut/master
Fixes Cable Merging and Floor Placing
2015-12-10 12:45:02 -05:00
Hubblenaut
5baf93722a Fixes subcategories of floor tiles not being placable 2015-12-10 16:28:40 +01:00
PsiOmegaDelta
ddb5fa9248 Syndicate id card now checks if the player mind an antag.
Instead of the player mob itself.
Fixes https://github.com/PolarisSS13/Polaris/issues/389.
2015-12-10 10:55:55 +00:00
Zuhayr
4376948bdf Forensics fixes/tweaks. 2015-12-10 19:20:09 +10:30
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
Neerti
0b5f18ab39 Removes debug world << output from holidays. 2015-12-10 00:50:42 -05:00
Neerti
e1694c40fe Merge pull request #483 from Hubblenaut/ttv
Ports Bay Fixes for TTV Yield
2015-12-09 22:30:25 -05:00
Neerti
4080710b3c Merge pull request #491 from PolarisSS13/12/8/2015_fixes_ghost_examine
Fixes ghost examination bug.
2015-12-08 21:46:04 -05:00
Neerti
8d22ded125 Merge pull request #493 from Hubblenaut/master
Camera Hotfix
2015-12-08 21:45:56 -05:00
Hubblenaut
97e33736c6 Camera Hotfix 2015-12-09 02:34:26 +01:00
EmperorJon
58e065444b Merge pull request #492 from EmperorJon/08_Dec._Skrell_snax_regulations_changes
SkrellSnax are no longer contraband.
2015-12-08 23:45:06 +00:00
Jon
99d1258d40 SkrellSnax are no longer contraband.
All hail warblekind.
2015-12-08 23:34:16 +00:00
Neerti
8d4770f798 Fixes ghost examination bug. 2015-12-08 18:13:00 -05:00
EmperorJon
0350ea5479 Merge pull request #484 from Hubblenaut/vendors
Fixes #470
2015-12-08 17:41:45 +00:00
Hubblenaut
35a0562f57 Fixes #470 2015-12-08 18:24:06 +01:00
HarpyEagle
7c758dfbb1 Updates changelog, fixes comment 2015-12-08 18:16:04 +01:00
HarpyEagle
a9d3f02cd5 Updates preset TTV bombs, adds debug verb 2015-12-08 18:15:55 +01:00
HarpyEagle
b60146728c TTV Refactor
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
2015-12-08 17:54:15 +01:00
Hubblenaut
94d1ad8dc1 Doors buzz only once on failed closing 2015-12-08 16:13:31 +01:00
Woodratt
74d5e804d7 Merge pull request #473 from Woodratt/1.2.5_WR_Bed_DLC2
Woodrat 1.2.5 Bed DLC
2015-12-07 19:31:09 -08:00
woodratt
21b6a4a102 Woodrat 1.2.5 Bed DLC
- Fixed scrubber line on the Engineering outpost
- Dropped max storage space on the dufflebag from 56 to 38
- Changed bed and bedsheet sprites.
- Removed bedsheet from the psych couch.
2015-12-07 19:18:04 -08:00
Neerti
f09dfe8347 Merge pull request #466 from Neerti/12/7/2015_apc_and_atmos_nanoUI_for_admins
NanoUI interaction for ghosts on APCs/Atmos
2015-12-07 02:49:50 -05:00
PsiOmegaDelta
443a376848 Ghosts can now view any object with a NanoUI interface.
However, ghosts can now also only view objects in range to ensure that the NanoUI window count is kept low.
Admins do not suffer this restriction and may also interact with these windows.
2015-12-07 02:35:33 -05:00
EmperorJon
dbbdbba15e Merge pull request #462 from EmperorJon/06_Dec._Fix_cargo_shuttle_sand
Fixes cargo shuttle sand floor
2015-12-06 23:52:13 +00:00
Jon
5fa4164dc4 Snowflake cargo shuttles don't use the shuttle area. They've been updated to have space as a base turf. 2015-12-06 23:47:42 +00:00
Neerti
c808371780 Merge pull request #444 from Neerti/12/4/2015_communicators
Adds cellphones!
2015-12-05 17:37:35 -05:00
Neerti
3e946447a3 Adds cellphones! Details in the changelog entry. 2015-12-05 17:26:13 -05:00
Woodratt
eae31c8ed8 Merge pull request #433 from Woodratt/Woodrat_Needs2GitGood_1.2
1.2 GITting good at Git
2015-12-04 23:32:14 -08:00
woodratt
04998bfdf6 1.2 GITting good at Git
- Disposals conveyor belt should be fixed, intercom adjusted.
- Industrial hardsuit now on top of rack.
- Atmos center post re-centered, intercom adjusted. Light switch and intercom for monitoring room.
- Cig packs added to the detective's office and fire alarm. Adjusted Intercoms
- Captain's office overhauled, adjusted intercoms, moved furniture, added shutters for that alone time with the secretary.
- Kitchen light moved from behind microwave to behind fridge. Intercoms adjusted.
- Displays and intercoms added to the research and mining outposts, guest pass added to research outpost.
- Fixed a hole in the socks with a pixel
- Tape added to art storage, adjusted intercom.
- Intercoms added to janitorial, IAA, and holodeck control.
- Coffee shop doors now have dual kitchen and bar access, front windoor added, adjusted layout, light switch installed.
- Cloner biomass increased to 600, button to open door added. Atmos alarm added.
- Several intercoms throughout medical adjusted and added.
- Security overhaul, several intercoms adjusted and added. Flashbang box added to the firing range. Warden's desk adjusted. Fire alarm added to front of brig. Photocopier added. Security huds added to lockers.
- Moved research disposal point to science break room. Fixed xenobio windoors and adjusted disposal.
- Xenoflora design overhaul.
- Emergency toolboxes added to the dorms.
- Bar drink dispensers moved two tiles up. Floor dance lights should work.
- Wire guards installed for the AI, Atmos alarms as well.
- Holodeck maint. APC and atmos alarm added. Locker with genetics backpack and coat added as well.
- Soap added to research, security, and medical rest rooms.
- Camera added to medical emergency hall.
- CE's Office front windows electrified.
- Disabled dynamic lighting on the engineering elevator.
- Guess pass terminal added to HOP office.
- Captain's beret in captain's locker.
- Fixed all active edges on Polaris-2, turret controls added for main areas.
2015-12-04 23:12:30 -08:00
GinjaNinja32
85373f7c16 fixes #199 2015-12-05 06:03:43 +00:00
EmperorJon
f6cb53835c Merge pull request #429 from EmperorJon/05_Dec._Update_main_z_level_space_areas
Updates all get_base_turf usages to get_base_turf_by_area.
2015-12-05 04:37:35 +00:00
Jon
85c704676f Updates all get_base_turf usages to get_base_turf_by_area.
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.
2015-12-05 04:24:17 +00:00
woodratt
1104407ffc Woodrat, Intercoms and rollerbed tweaks
- Departmental intercoms should have
2015-12-04 17:12:57 -08:00