cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,401 Commits 2 Branches 1 Tag
ebc58b08d92b465dedd94c57de1aa0b89d288196
Commit Graph

11550 Commits

Author SHA1 Message Date
PsiOmega
ebc58b08d9 Power monitor UI now attempts to get the turf of its host. 
get_turf() gets upset when attempting to get the loc of the power monitor itself, now being a datum.
 2015-06-09 16:24:47 +02:00
Zuhayr
73146a62fe Merge pull request #9747 from PsiOmegaDelta/150608-NanoPaths 
NanoUI sources can now be datums instead of atom/movable.
 2015-06-09 20:08:02 +09:30
PsiOmegaDelta
0af1009b50 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-09 12:14:35 +02:00
PsiOmegaDelta
97f49bb982 Merge pull request #9756 from Baystation12/master 
Dev-freeze
 2015-06-09 12:12:40 +02:00
PsiOmegaDelta
ec68454f63 Fixes #9753. 
Being admin jumped or jumping to another location now cancels ghost tracking.
Also adds proper permission checks.
 2015-06-09 08:55:12 +02:00
GinjaNinja32
54b531c36e Merge pull request #9743 from Techhead0/voidsuitTweaks 
Minor tweaks to voidsuits.
 2015-06-09 02:51:24 +01:00
PsiOmega
13cb32fa7f Another MayRespawn() fix. 
Being unable to reenter your body now allows you to respawn, even if your body lives.
 2015-06-08 17:39:25 +02:00
PsiOmegaDelta
20542bf84b NanoUI sources can now be datums instead of atom/movable. 
Also accidentally fixes #7042 as the AI no longer cares about the machinery var.
 2015-06-08 17:06:06 +02:00
Chinsky
94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors 
Ports /tg/'s meteors.
 2015-06-08 14:17:57 +03:00
Zuhayr
389178a9ad Merge pull request #9745 from Kelenius/ofReagentsAndOD 
Fixes #9738 - reagents always overdose
 2015-06-08 20:43:55 +09:30
Kelenius
37f02ebc93 Fixes #9738 - reagents always overdose 2015-06-08 12:41:58 +03:00
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
GinjaNinja32
d6677d4389 Merge pull request #9739 from PsiOmegaDelta/150608-NoPowerNoControl 
AI restrictions and rejuvenation.
 2015-06-08 10:08:55 +01:00
PsiOmegaDelta
81ee9178bd Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-08 09:57:33 +02:00
PsiOmegaDelta
5d058be2e6 Merge pull request #9741 from Baystation12/master 
Dev-freeze
 2015-06-08 09:56:24 +02:00
PsiOmegaDelta
cad9b59c25 AI restrictions and rejuvenation. 
Ensures the AI cannot use Topics() while unpowered.
Ensures the AI is properly rejuvenated by the AI verb, as a functional AI will now never be lying down.
 2015-06-08 09:10:33 +02:00
zonthori
98ca5466e2 Straight base_state 2015-06-07 13:56:11 -06:00
zonthori
ccb01cd4ed Fixes https://github.com/Baystation12/Baystation12/issues/9728 
Fixes custom welding helmet sprites to break when toggled.

https://github.com/Baystation12/Baystation12/issues/9728
 2015-06-07 13:38:44 -06:00
Techhead0
9f93abbaf3 Removes Beehive and Pompadours from Unathi hairstyles. 
As per Unathi Loremaster Ikky's request. Tested to not corrupt savefiles.
 2015-06-07 12:31:55 -04:00
PsiOmega
26e5734e93 The AI screen now glows. 
With the color depending on the chosen display screen.
 2015-06-07 13:48:32 +02:00
Chinsky
bb824dba42 Merge pull request #9721 from atlantiscze/apcfix 
Refactors /obj/item/apc_frame to /obj/item/frame/apc
 2015-06-07 12:43:01 +03:00
PsiOmega
b5c0478ae2 Fixes compilation errors. 2015-06-07 11:14:06 +02:00
PsiOmega
fc6de24042 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm
 2015-06-07 10:51:41 +02:00
PsiOmega
fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
 2015-06-07 10:30:27 +02:00
PsiOmegaDelta
6eea4ae7da Merge pull request #9712 from mwerezak/all-things-to-everyone 
Chameleon items
 2015-06-07 09:01:11 +02:00
PsiOmegaDelta
2e920bce69 Merge pull request #9711 from mwerezak/syringelog 
Syringe gun logs, logging helper reorganization
 2015-06-07 09:00:21 +02:00
Zuhayr
2eb14e037f Merge pull request #9709 from PsiOmegaDelta/150606-GhostSpawn 
Fixes #9685.
 2015-06-07 15:06:09 +09:30
Atlantis
41d4c2eb13 Refactors /obj/item/apc_frame to /obj/item/frame/apc 
- This fixes broken APC frame placement on walls - #9537
 2015-06-07 06:26:10 +02:00
mwerezak
8567162461 Updates chameleon gun help text 2015-06-06 23:26:56 -04:00
GinjaNinja32
8d799293ba Merge pull request #9701 from Zuhayr/dev-freeze 
Fixes #9597
 2015-06-07 03:14:06 +01:00
Zuhayr
22bf5352a3 Merge pull request #9698 from PsiOmegaDelta/150605-ChockingLogs 
Fixes #9697
 2015-06-07 11:27:32 +09:30
mwerezak
3906989eac Mostly removes creation of throwaway objects from chameleon items 
- Replaces the creation of throwaway items from New() with initial() calls for all chameleon items.
- Unfortunately throwaway items could not be removed when switch appearance, as initial() does not work very will with list vars.
- Makes chameleon item name cache lists global.
- Makes chameleon guns a subtype of energy guns, removes chameleon magazines.
- Moves chameleon.dm to clothing module root
- Items without icon or icon_state are no longer selectable as chameleon appearances.
- Chameleon verbs go in their own panel.
 2015-06-06 18:19:23 -04:00
mwerezak
f62cc38883 Adds logging for syringe_gun 
Also updates holder get_reagents() output formatting
 2015-06-06 17:02:42 -04:00
PsiOmegaDelta
c4ecf46a4c Merge pull request #9713 from mwerezak/gunlag 
Muzzle flash sets lighting instead of creating objs
 2015-06-06 21:19:11 +02:00
GinjaNinja32
5f75e3038e Merge pull request #9710 from atlantiscze/beyond-undestructible 
Fixes #9705
 2015-06-06 20:16:17 +01:00
mwerezak
15d82778cd Muzzle flash sets lighting instead of creating objs 
Shooting a gun no longer generates illumination objects
 2015-06-06 12:57:43 -04:00
mwerezak
0725b0cc3e Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments 2015-06-06 11:53:12 -04:00
Atlantis
265719b4aa Fixes #9705 
- Carboard now has Integrity of 10. For comparsion, wood has 25, steel 150 and plasteel 800.
 2015-06-06 17:30:43 +02:00
PsiOmega
cbead4224b Fixes #9685. 
Observer from the lobby do not have minds, while observers that once lived do.
Re-arranges the MayRespawn() logic to handle these situation.
 2015-06-06 15:44:49 +02:00
Atlantis
f66e5c9c94 Fixes #9619 2015-06-06 06:52:42 +02:00
Zuhayr
f03fc826f1 Fixes #9597 2015-06-06 11:20:56 +09:30
GinjaNinja32
fb1904ef4e Fixes a pair of null.z runtimes 
Fixes explosions with multiz maps breaking if the epicenter is null
Fixes supermatter trying to irradiate mobs in nullspace crashing the proc
 2015-06-06 02:23:06 +01:00
PsiOmega
711eb0501c Fixes #9697 
Replaces and closes the <span>
 2015-06-05 21:17:11 +02:00
Yoshax
7b19c85ac5 Makes file use user and not usr 2015-06-05 19:04:11 +01:00
Yoshax
afe081d836 Makes scrying orb only usable by wizards 2015-06-05 18:35:19 +01:00
PsiOmegaDelta
079b0af6b0 Adds spinning animation for meteors. 2015-06-05 15:55:39 +02:00
PsiOmegaDelta
bad9c103eb Merge remote-tracking branch 'upstream/dev' into 150605-Meteors 
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
 2015-06-05 14:59:52 +02:00
PsiOmegaDelta
a07d20d657 Ports /tg/'s meteor implementation. 
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
 2015-06-05 14:58:35 +02:00
Chinsky
e3f64178c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade 2015-06-05 13:24:03 +03:00
PsiOmegaDelta
c3f0a46c19 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/briefcase.dm
	html/changelogs/.all_changelog.yml
 2015-06-05 10:39:41 +02:00