cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-28 19:11:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,384 Commits 2 Branches 1 Tag
94406a643037d848ece4998d30c45d188a3507ad
Commit Graph

19122 Commits

Author SHA1 Message Date
Chinsky
94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors 
Ports /tg/'s meteors.
 2015-06-08 14:17:57 +03: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
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
PsiOmega
dc3c2991bf Replaces numbers with constants. 2015-06-07 09:14:23 +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
PsiOmegaDelta
ddc1f888dd Merge pull request #9717 from mwerezak/bombcap 
Adjusts how reagents_explosion applies bombcap.
 2015-06-07 08:50:45 +02:00
Zuhayr
1bb063041b Merge pull request #9718 from mwerezak/zonemerge 
Allows small zones to merge even if zone-blocked
 2015-06-07 15:13:09 +09:30
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
mwerezak
03412a24f8 Allows indirectly connected turfs to merge zones if either zone is small enough. 
Fixes #9235
 2015-06-06 23:24:11 -04:00
mwerezak
821285bcee Adds defines for bombcap components 2015-06-06 22:38:56 -04:00
mwerezak
636ead5bbe Makes reagents_explosion apply bombcap in the same manner as tank transfer valves. 
Also fixed reagents_explosion/start() checking the flash var instead of the flashing var.

Fixes #8280
 2015-06-06 22:17:11 -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
mwerezak
e7757de068 Moves key_name() to logging.dm 2015-06-06 17:01:31 -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
GinjaNinja32
dc40298fe8 Merge pull request #9703 from atlantiscze/stop-runtiming 
Fixes #9619
 2015-06-06 20:08:27 +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
PsiOmegaDelta
e48b527c4b Merge pull request #9708 from atlantiscze/newmalf-manual-change 
RSC paths for ai_help command
 2015-06-06 15:41:24 +02:00
Atlantis
f0026b5c3b RSC paths for ai_help command 2015-06-06 14:55:33 +02:00
Atlantis
f66e5c9c94 Fixes #9619 2015-06-06 06:52:42 +02:00
Atlantis
4b19e8be69 Fixes #9548 
- AI's name is now correctly displayed when the AI is clientless while being grabbed with intellicard.
- AI's wireless radio is no longer automatically muted when the AI is transferred to intellicard. It may still be muted from the UI if the intellicard's owner wants it.
 2015-06-06 06:28:46 +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
Zuhayr
44a6652d0a Merge pull request #9696 from Yoshax/morewizardfixes 
Makes scrying orb only usable by wizards
 2015-06-06 05:03:50 +09:30
GinjaNinja32
16faba0f7c Merge pull request #9692 from Baystation12/dev-freeze 
Dev freeze
 2015-06-05 20:32:30 +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
PsiOmegaDelta
2da0a5e979 Merge pull request #9690 from Kelenius/ofPuffsAndCleaner 
Of puffs and cleaner
 2015-06-05 20:02:08 +02:00
Yoshax
afe081d836 Makes scrying orb only usable by wizards 2015-06-05 18:35:19 +01:00
Kelenius
345cd7a738 Adds a simulated check to chempuffs 2015-06-05 19:20:46 +03: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