cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,239 Commits 2 Branches 1 Tag
8e7696635768e9dc1fd992cd400176daa36cbe21
Commit Graph

3384 Commits

Author SHA1 Message Date
Mloc-Argent
e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
 2014-05-14 22:42:03 +01:00
Zuhayr
ce4f7d4708 Fixes #4979 2014-05-14 17:02:04 +09:30
bs12-bot
1f614c3149 Merge pull request #4971 from Ravensdale/and_yeah_he_doth_spake-let_there_be_light 
Fixes runtime with yellow slime extracts.
 2014-05-12 19:02:31 +01:00
Ccomp5950
bc21d1734c Merge pull request #4962 from mwerezak/internal-storage-ground-fix 
Internal storage fix
 2014-05-12 11:41:48 -05:00
Ravensdale
8e15a76da1 Fixes runtime with yellow slime extracts. 2014-05-12 01:15:45 -07:00
Mloc-Hibernia
d1d3620a12 fix another merge issue 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-05-11 13:56:17 +00:00
Mloc-Hibernia
f2924c9f57 Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons 2014-05-11 13:48:51 +00:00
Mloc-Hibernia
f606f35690 fix messy merge resolution 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-05-11 13:26:28 +00:00
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
 2014-05-11 13:19:09 +00:00
Loganbacca
f32d281132 Compressed matter implanter fix 
Compressed matter implanters will now correctly remove the compressed item from the game world if it is in an inventory (player or storage container).
 2014-05-11 18:30:18 +12:00
Mike
cee43ffbf3 Fixes internal storage on ground 
Fixes not being able to remove items from internal storage when the
master item is on the ground.
 2014-05-10 23:41:48 -04:00
Zuhayr
5e682668b2 Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 2014-05-10 02:10:06 +09:30
Zuhayr
1fc3ecf145 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Zuhayr
8d6b5e6d5c Fixes #4911 2014-05-10 01:23:29 +09:30
Zuhayr
9f2f5fb488 Fixes #4808 2014-05-10 00:30:03 +09:30
Zuhayr
4d64af69f4 Fixes #4923 2014-05-09 21:29:44 +09:30
Mloc-Argent
a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Zuhayr
a1f6b7a211 Merge pull request #4885 from mwerezak/equipment-fixes 
Misc Equipment fixes - Mostly hardsuits
 2014-05-07 09:59:44 +09:30
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Ccomp5950
3739ed03ff Merge pull request #4905 from Jarcolr/properhudobject 
Cyborg hud modules now have proper icon states
 2014-05-04 09:36:32 -05:00
Jarcolr
e050251c81 Cyborg hud modules now have proper icons 
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png
 2014-05-04 16:06:10 +03:00
Jarcolr
5bc9ea47e4 Added storage/misc for objs that don't fit in 
Also moved the dicepack there.
 2014-05-04 00:40:08 +03:00
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 16:56:19 +01:00
Zuhayr
0e39f18763 Compile fix. 2014-05-03 23:17:08 +09:30
Zuhayr
5b32150858 Fixes for previous commit, sigh. 2014-05-03 21:21:19 +09:30
Zuhayr
25c85d6e2a Adding some repair procs to cables and welders for IPC use. 2014-05-03 21:10:26 +09:30
Zuhayr
5ef994337b Fix for previous commit. 2014-05-03 20:13:20 +09:30
Zuhayr
0dfe70fe2b IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand. 2014-05-03 20:08:45 +09:30
Mike
946fd5329f Fixed null flag for cigarette type 2014-05-02 15:59:47 -04:00
Mike
d684a77119 Fixes #4780 2014-05-01 23:58:47 -04:00
Hubblenaut
5b18ec42c4 Fixed Tape Recorders printing transcripts with a 'paper'-prefix 2014-05-02 02:17:46 +02:00
Chinsky
ebf9f86afd Merge pull request #4858 from mwerezak/webbing 
Storage and Clothing/Accessory Changes and Cleanup
 2014-05-01 03:38:19 +04:00
Ravensdale
b8696668a7 Fix for problem #2891 2014-04-30 08:20:44 -07:00
Mike
ba0dded672 Holsters and Unathi knife harness 
Also fixed mistyped path and OnClick bug.
 2014-04-29 22:43:10 -04:00
Mike
ae49ba210b Webbings now use internal storage 
Clothing no longer manipulates webbing members for better encapsulation.
Instead attackby() and attack_hand() are forwarded to accessories if
they are present.
Removed "Look in Storage" verb for less verb clutter.
 2014-04-29 20:34:01 -04:00
Ccomp5950
7f5b5bb5af Merge pull request #4851 from thelegendofbrian/pAI 
pAI GUI Massive Update
 2014-04-29 18:49:54 -05:00
Mike
172bda548e Fixed internal storage, added coat pockets 
/mob/proc/ClickOn() now checks storage levels, not just contents levels,
now allows items to be taken out of internal storage attached to another
item.
Coats now use internal storage for their pocket slots, removed duplicate
storage code.
Moved coat.dm out of it's special folder and into modules/clothing.
 2014-04-29 19:00:36 -04:00
Mike
51f8bfe3ce Fixed accidentally omitted call to parent 2014-04-29 09:37:25 -07:00
Mike
591df34c86 Removed broken backpack unequipping sound 2014-04-29 09:20:21 -07:00
Mike
5a797b8d03 Add internal storage type 2014-04-29 09:18:17 -07:00
Brian Cook
6b16a4140c Added missing header to pAI Request Module 
Also changed max frequency of radio config to 159.9 instead of 159.1
 2014-04-28 16:56:39 -07:00
Brian Cook
67da07445b Added refresh button to host bioscan page 
Also tweaked all pAI GUI so the background doesn't repeat-y
 2014-04-28 13:26:52 -07:00
RavingManiac
96b7647039 Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts. 2014-04-28 00:28:06 +08:00
Brian Cook
381a61d6be Centered background on pAI GUIs 2014-04-27 05:22:36 -07:00
Brian Cook
2ea7ff44a3 Improved GUI for users interfacing with pAI 
Also minor tweak to GUI for requesting pAI.
 2014-04-26 20:13:22 -07:00
Brian Cook
cca92a2e85 Improved GUI for requesting pAI 
Made the pAI Request Module and the pAI Availability List pretty.
 2014-04-26 17:10:37 -07:00
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-25 21:14:58 -05:00
Mloc
74ef3765d0 Merge pull request #4825 from DJSnapshot/hotfix 
IPC fixes
 2014-04-25 21:32:45 +01:00
DJSnapshot
a6fbde8f2f Fixes for Mloc, part 2. 2014-04-25 13:31:10 -07:00