cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 18:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,575 Commits 2 Branches 1 Tag
be97cbaf48ccd499ebb61096c4bcac532526ece4
Commit Graph

21372 Commits

Author SHA1 Message Date
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
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
Neerti
b5326950c4 Merge pull request #494 from Mark9013100/12/8/2015cratefix 
Removes duplicate webbing from webbing crate
 2015-12-09 02:33:42 -05:00
Mark9013100
7e68e3d490 Removes duplicate webbing from webbing crate 2015-12-08 22:16:55 -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
EmperorJon
352825ef07 Merge pull request #481 from Hubblenaut/airlocks 
Airlocks buzz only once on failed closing attempt
 2015-12-08 17:41:09 +00:00
Hubblenaut
35a0562f57 Fixes #470 2015-12-08 18:24:06 +01:00
Hubblenaut
94d1ad8dc1 Doors buzz only once on failed closing 2015-12-08 16:13:31 +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
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