Commit Graph

21406 Commits

Author SHA1 Message Date
Hubblenaut
183ac02f32 Merge branch 'master' of https://github.com/PolarisSS13/Polaris
Conflicts:
	html/changelogs/Hubblenaut-dev.yml
2015-12-08 15:50:00 +01:00
Hubblenaut
baec8f15d1 Changes to Pushing Mechanics 2015-12-08 15:15:00 +01:00
Neerti
c56e6d173c Merge pull request #463 from Sabess/master
Added more reskins for the M1911 and some other stuff.
2015-12-08 08:15:19 -05:00
SinTwo
149fe99fcb Merge pull request #476 from PolarisSS13/Sin2_fixes_12-7-15
Jacket and Helmet Fix
2015-12-07 23:07:50 -05:00
SinTwo
897e6c8382 Fixes some clothes. 2015-12-07 22:49:32 -05: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
EmperorJon
2dc59a5c96 Merge pull request #469 from EmperorJon/07_Dec._Fix_SMG_desc
Changes 12mm to 10mm.
2015-12-07 23:59:50 +00:00
Jon
ef987c5124 Changes 12mm to 10mm. 2015-12-07 23:59:11 +00:00
Neerti
e379810a07 Kills infinite loop, skins it, then makes a carpet out of it to decorate my imaginary room full of trophies of other bugs I've slain.
The infinite loop occured due to the wire datum calling interact() on it's holder, which made it call Interact() on it's wire datum, and so on.
2015-12-07 05:23:38 -05:00
Neerti
f219980a3d Fixed merge conflicts causing lack of compilation hopefully. 2015-12-07 03:38:38 -05:00
PsiOmegaDelta
a1203ed942 Fixes the broken Antag Uplink.
NanoUI re-assigns src_object, rather than merely acquiring the host, causing ui_interact() updates to be called on the wrong object.
Fixes #11607.
2015-12-07 03:06:56 -05:00
PsiOmegaDelta
15cc546556 Backports NanoUI fixes from dev.
Fixes #11579.

Conflicts:
	code/modules/nano/modules/crew_monitor.dm
2015-12-07 03:05:39 -05:00
PsiOmegaDelta
9db4ba1da0 Adds a remote interaction state for NanoUI.
This state has two checks:
A preliminary check of the remote target, ensuring it's powered, etc. If the remote target is fully disabled, it closes the window and conducts no further checks.
It then makes a full check, ensuring that the mob is capable, within range of the source remoting to the remote target, etc.

Unlike most other static interaction states, whoever initializes the remote state is responsible for deleting it properly.

Conflicts:
	polaris.dme
2015-12-07 02:56:43 -05: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
Neerti
2847d9a7ef Prepares for cherrypicking. 2015-12-07 02:35:20 -05:00
sabess
7e0a8f9145 Fixed notes, oops 2015-12-07 18:31:53 +11:00
sabess
76a11a1fd0 Fixed stuff 2015-12-07 18:11:17 +11:00
Neerti
4ecddd7e8b Adds attack_ghost() to base atmospherics object and APC to allow ghosts to see the nanoUI, and for admins to modify the objects from the interface. 2015-12-07 02:06:25 -05:00
sabess
47a6e38a8d Added more reskins for the M1911, all of which have different sprites when empty. Added this functionality for the default M1911 as well as the default MK58s. 2015-12-07 14:25:06 +11: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
e54280b460 Merge pull request #437 from Yoshax/master
Adds ability to smash drinking bottles on things other than people
2015-12-06 09:15:46 -05:00
Mark9013100
457c40d46f Fixes #448 and #401, custom loadout edit. 2015-12-06 06:26:06 -05:00
SinTwo
10277880ee Map and GitHub buttons 2015-12-06 01:47:38 -05:00
GinjaNinja32
7024348ff3 fix rules button 2015-12-06 06:02:48 +00:00
Neerti
ffab1eda95 Fucking fuck. 2015-12-05 18:01:32 -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
Datraen
ca6a970182 Fixes the inability to use cargo tugs 2015-12-05 15:15:53 -05:00
Jon
7993d10a3b I'm a moron and this will teach me to not lazy copypaste. 2015-12-05 18:22:48 +00:00
Jon
cb62041cad Adds an "emo fringe" hairstyle that's just emo long without the long bits. I quite like it so whatever. 2015-12-05 15:38:54 +00:00
Yoshax
db7af654ec Adds checks to ensure target is valid, adds user feedback 2015-12-05 15:10:10 +00:00
sabess
dc816938ae Adds some hairstyles! 2015-12-06 01:56:29 +11:00
Yoshax
6fa987f18f Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2015-12-05 14:24:59 +00:00
Yoshax
4c201d8219 Adds ability to smash bottles on things other than people's heads 2015-12-05 14:22:40 +00:00
GinjaNinja32
944b1255e4 add verbs to allow players to spin their view 2015-12-05 10:52:29 +00:00
woodratt
aca388d360 Minor Sock additions
- Added striped knee and thigh socks.
- Added rainbow knee and thigh socks.
2015-12-05 00:25:26 -08: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
Neerti
ff174b839a Merge pull request #432 from GinjaNinja32/patch-1
fixes #199
2015-12-05 01:29:05 -05:00
Neerti
1da136d31d Merge pull request #430 from MagmaRam/records_fix
Fix for record problems in #220
2015-12-05 01:28:50 -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
MagmaRam
6c39070a15 Fix for records being a complete mess
Because of the limitations of BYOND's bitwise operators (which affect both the
old and new implementations of num2hex()), you can't use numbers larger than 2^16
for this.

I cut the number of digits down to 4 and changed the maximum on the RNG to match.
2015-12-04 22:28:53 -06: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