cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-19 22:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,392 Commits 2 Branches 1 Tag
0624fced644fb2388c91a54dbe7dfee71df98c18
Commit Graph

358 Commits

Author SHA1 Message Date
Techhead0
f2f34b9a38 Minor tweaks to voidsuits. 
Component removal uses a dialogue box instead of removing items in a set order.
Renames "Eject Tank" to avoid duplicate verb names.
Changes order of components when equipping voidsuits.
Two user message changes.
 2015-06-08 05:30:11 -04:00
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
 2015-05-30 15:59:54 +02:00
Raptor1628
62ef32a725 Rig Icon Fixes 
Fixes some incorrect names that were resulting in broken icons.
 2015-05-27 23:32:27 -04:00
mwerezak
d65ec62dcb Fixes #9493 2015-05-26 22:49:16 -04:00
PsiOmega
c21a456379 Fixes #9447. 
The inteliCard now has a NanoUI interface, allowing it to utilize custom CanUseTopic() checks depending on context, in-hand or in-rig.
 2015-05-24 11:33:54 +02:00
PsiOmega
e74c0e65bf Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/power_cells.dm
 2015-05-22 08:26:13 +02:00
mwerezak
e23f5e7e06 Fixes hardsuit shocking 2015-05-18 20:09:31 -04:00
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
Zuhayr
325bd42c66 Fixes #9233 2015-05-15 23:37:52 +09:30
Zuhayr
624a6b0bca Fixes #9250 2015-05-15 18:26:53 +09:30
PsiOmega
f9306431b7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2015-05-14 22:20:58 +02:00
PsiOmega
91f67e5dc5 Adjusts rig stealth module costs. 
Activation and active power costs were previously a tenth of the same costs for a mere energy blade.
Now costs matches that of an energy blade.
 2015-05-13 22:38:52 +02:00
Chinsky
e9cc39039c Merge pull request #8946 from Zuhayr/miningstuff 
Wall refactor/mining changes.
 2015-05-12 13:13:31 +03:00
Zuhayr
c06323ef7a Merge pull request #9199 from Techhead0/voidmachine-englishlists 
Changes machine frames and voidsuits to use proc/english_list() and removes frame_desc
 2015-05-12 14:20:37 +09:30
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Techhead0
f6977dd8ed Changes machine frames and voidsuits to use proc/english_list() 
Also includes formatting changes to voidsuit examine.
 2015-05-11 20:29:35 -04:00
Zuhayr
e28acd5045 Dev merge. 2015-05-11 18:45:14 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Techhead0
95aef467a0 Magboots can be worn over shoes 
Equipping magboots or a voidsuit with magboots installed will place them
over any existing shoes. Existing shoes are replaced on feet when magboots
are unequipped. Magboots cannot be worn over other magboots.
Fixes #9125
Changelog for this and my previous voidsuit changes included.
 2015-05-09 14:20:03 -04:00
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
Zuhayr
dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
mwerezak
5b037670b3 Removes most instances of item_color 
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
 2015-04-22 17:40:27 -04:00
Mark9013100
f97d73f2a8 Fixes the naming of the merc space suits 2015-04-20 18:19:04 -04:00
PsiOmega
08fa1193ce Adds Hardsuit Module tab. 
Allows one to (de)activate, engage, select and change module charges from the  	"Hardsuit Modules" tab panel.
Basic idea similar to spells.
 2015-04-16 08:54:04 +02:00
Chinsky
d408886333 Merge pull request #8837 from Techhead0/voidtank 
Voidsuit Examine info.
 2015-04-14 16:36:44 +03:00
Techhead0
d27f7ef799 Voidsuit Examine info. 
Examining voidsuits will tell you what items are installed (with tiny icons) and the pressure of any installed tanks.
 2015-04-13 11:08:07 -04:00
PsiOmegaDelta
095a572c71 Merge pull request #8829 from Techhead0/voidtank 
Installable Voidsuit tanks.
 2015-04-13 13:57:56 +02:00
Techhead0
c8487db13b Eject Tank verb and span classes 
Now you can eject your tank onto the ground while wearing the suit.
Toggle Helmet verb now uses span classes.
 2015-04-13 05:02:20 -04:00
Chinsky
7a40d193fe Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen 
Refactors NanoUI interaction (again)
 2015-04-11 04:43:50 +03:00
Chinsky
be3f372680 Merge pull request #8788 from PsiOmegaDelta/PortedSpells 
Ports /vg/'s spell system for use by the cult port.
 2015-04-11 02:05:58 +03:00
PsiOmega
49d3f0fcf7 Merge remote-tracking branch 'upstream/dev' into NanoRefactorUmptheen 2015-04-10 15:49:36 +02:00
PsiOmega
1ba8dcbca9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/vending.dm
 2015-04-10 15:25:34 +02:00
PsiOmega
e37c5c22d4 Refactors NanoUI interaction (again) 
Takes NanoUI interaction code and splits it into more manageable modules.

The default handler that checks distances, camera coverage, etc., etc.
Admin NanoUI windows now only check for admin rights, ignoring sight, distance, and anything else.
ERT/mercenary appearance changer now remains open for as long as the mob remains on the admin Z-level.
PDAs and uplinks now require that you keep the item somewhere in your main inventory (or contents to be precise). Hands or ears are fine, inside bags are not.
Rig suits also check that they are in the operator's inventory or that the synthetic operator is somewhere within the suit's contents (recursively).
 2015-04-10 11:19:38 +02:00
PsiOmega
990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
GinjaNinja32
7483b9fcb2 Fixes hardsuits completely breaking all the time 2015-04-09 13:58:10 +01:00
PsiOmega
71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm
 2015-04-08 10:55:26 +02:00
PsiOmegaDelta
fd1b6343f0 Merge pull request #8655 from volas/sanitize_procs2 
sanitize(), part 2
 2015-04-06 15:16:17 +02:00
Chinsky
ae75e3555e Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience 
Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
 2015-04-05 05:23:14 +03:00
Raptor1628
cf74e22870 Hardsuit Stuff 
Icons for all modules and control modules, two new suits, some modified
stats. Station suits are now split, with their spawned "equipped"
version having modules and access requirements, and their parent type
having neither.
 2015-04-04 17:59:10 -04:00
PsiOmega
8e55ad8114 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/mob.dm
 2015-04-03 09:33:05 +02:00
volas
2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
Zuhayr
1070a8f63c Adds weedkiller smoke checks to hydro trays and spreading plants. 2015-04-01 07:25:09 -07:00
Zuhayr
63a2fc6bff Fixes #8682 2015-04-01 07:05:58 -07:00
Chinsky
65f61122b5 Merge pull request #8604 from Zuhayr/limbs 
Limb objects, severing and cybernetics
 2015-03-31 08:38:54 +03:00
mwerezak
9ad533a094 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2015-03-31 00:16:56 -04:00
Chinsky
5429378703 Added check for second pAi for #8287 2015-03-30 22:55:17 +03:00
PsiOmegaDelta
fefb55db93 Merge pull request #8674 from GinjaNinja32/rig_guns 
Rig weapon fixes
 2015-03-30 15:02:22 +02:00