Commit Graph

13038 Commits

Author SHA1 Message Date
Zuhayr
07874b9ca8 Holsters will now show as 'occupied' on examine if something is in them. 2015-12-11 15:52:05 +10:30
Neerti
5dbbbaa80b Merge pull request #456 from Zuhayr/master
Porting forensics from Aurora.
2015-12-10 19:50:44 -05:00
zaredman
84832f8a9d Merge pull request #515 from EmperorJon/10_Dec._Removes_grimderp_AI_news_event
Changes the description for the AI SYSTEMATICALLY KILLING CIVILIANS GRIMDEERRRRP news event
2015-12-10 17:11:45 -05:00
Jon
5d3e3cf863 Removes the AI SYSTEMATICALLY KILLING CIVILIANS GRIMDEERRRRP news event. Replaces the message with one saying it simply caused damage. 2015-12-10 21:35:35 +00: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
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
Neerti
9d4d8e3998 Merge pull request #508 from Hubblenaut/flavor
Tiny Fixes
2015-12-10 12:44:43 -05:00
Hubblenaut
95a190ae30 Fixes empty flavor text drawing two spaces 2015-12-10 18:07:00 +01:00
Hubblenaut
76577f2696 Fixes subcategories of cable coils not being mergeable 2015-12-10 16:28:44 +01:00
GinjaNinja32
6c736adfbb fix autohiss for fully-capitalised strings 2015-12-10 10:55:41 +00:00
GinjaNinja32
1b2a068d7e fix #11637 2015-12-10 10:55:31 +00:00
ccomp5950
f0b6a933aa Ninjas teleporter: Checks Z levels and distance.
Ninjas are able to use a camera console and teleport across the map.  This resolves that.
2015-12-10 10:55:13 +00:00
Zuhayr
906318d3fc Compile fixes. 2015-12-10 19:22:15 +10:30
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
e573581a28 Merge pull request #496 from Woodratt/1.2.6_Bar_Signs_and_Power
1.2.6 Bar Sign and Power tweaks
2015-12-09 03:41:48 -05:00
woodratt
b1735a3063 1.2.6 Bar Sign and Power tweaks
- Created prescription Huds for medical and security. Two exist in the medical exam room, two in the security restroom.
- Boot Knives Bar Sign
- Tactical light in the warehouse replaced with a more low speed option
- Adjusted Atmos SMES to input from round start
- Adjusted Main SMES to start with about 70% power and a 700k Output.
2015-12-09 00:21:26 -08:00
Neerti
894ad58277 Fixes people spawning in space.
People were spawning in space due to a runtime error that occured when they choose the orange scarf, because the loadout entry lacked a path variable.
2015-12-09 02:50:51 -05:00
HarpyEagle
a9d3f02cd5 Updates preset TTV bombs, adds debug verb 2015-12-08 18:15:55 +01:00
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
897e6c8382 Fixes some clothes. 2015-12-07 22:49:32 -05: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
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
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
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
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