Commit Graph

5342 Commits

Author SHA1 Message Date
Neerti
2aaa4e9a5e Merge pull request #525 from Zuhayr/qol
Porting various QOL from Bay.
2015-12-13 21:25:43 -05:00
Neerti
dc0711a438 Merge pull request #553 from Woodratt/1.3.1_Holiday_Special
1.3.1 Christmas and tweaks.
2015-12-13 16:43:39 -05:00
Dibasic
c024a20893 Fixes window 'bang' typo
Fixes the typo when harm-intent clicking a window with your bare hand:

<You bang against the window!

to:

You bang against the window!
2015-12-13 03:18:43 -06:00
woodratt
13adf4f235 1.3.1 Christmas and tweaks.
- Intercoms added to the chapel, recreation area, pool.
- Maint door added to the starboard maint.
- Removed the second sleeper from the merc shuttle.
- Replaced the central tree at central with a Christmas tree.
- Added a small Christmas tree, Christmas lights, Tiny Christmas tree, and holiday wreaths to map. (Sprites from Aurora)
- Christmas decorations added everywhere.
- Garden statue tucked into maint, replaced with a big Christmas tree.
- Drink Machine added to security
- Fixed the pathing on therapy dolls.
- Removed farwa plushie from psych office, replaced with blue therapy doll.
2015-12-12 21:14:23 -08:00
Neerti
ab66a273e0 Merge pull request #541 from Mark9013100/12/11/2015detbeltandsecedits
Adds a detective belt and other edits for security
2015-12-12 23:21:52 -05:00
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
Mark9013100
09b9be4b72 Adds a detective belt and other edits for security 2015-12-11 22:43:13 -05: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
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
Zuhayr
1ea7aebb62 Added boot knives and putting a knife in your boot. 2015-12-11 15:55:23 +10:30
Zuhayr
000438aa94 Allowed lighters to be put into cigarette packets. 2015-12-11 15:55:15 +10:30
Zuhayr
793bc18efd Mops can now be wet in buckets or sinks. 2015-12-11 15:54:56 +10:30
Zuhayr
1a42e14833 You can now pull your punches when engaging in unarmed combat. 2015-12-11 15:54:37 +10:30
Zuhayr
14b124a97e Duct tape can now be used to gag, blindfold or cuff people, and cable cuffs/duct tape can restrain rig-wearing people (poorly). 2015-12-11 15:54:04 +10:30
Zuhayr
4c904dc782 Oxygen tanks now have a visual indicator of their pressure on the item icon. 2015-12-11 15:52:54 +10:30
Zuhayr
10bee3618c Bats can now be slung over your back. 2015-12-11 15:52:29 +10:30
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
e1694c40fe Merge pull request #483 from Hubblenaut/ttv
Ports Bay Fixes for TTV Yield
2015-12-09 22:30:25 -05:00
Neerti
8d4770f798 Fixes ghost examination bug. 2015-12-08 18:13:00 -05: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
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
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
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
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
EmperorJon
3c0ae200c8 Merge pull request #423 from EmperorJon/04_Dec._Merge_synth_access_fix
Object access check fix.
2015-12-04 19:08:43 +00:00
PsiOmegaDelta
11904bd805 Object access check fix.
Objects now only check synth access as intended, instead of the more restrictive allowance.
Fixes https://github.com/PolarisSS13/Polaris/issues/409.
2015-12-04 18:42:52 +00:00
Hubblenaut
470d2bb54a Fixes stack creation logic and return value 2015-12-04 15:49:31 +01:00
Earthcrusher
61c8140c01 My first contribution to Polaris! Adds a few new brands of cigarettes to vending machines. 2015-12-03 21:20:11 -06:00