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

4652 Commits

Author SHA1 Message Date
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
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
ddc1f888dd Merge pull request #9717 from mwerezak/bombcap 
Adjusts how reagents_explosion applies bombcap.
 2015-06-07 08:50:45 +02:00
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
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
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
PsiOmegaDelta
2da0a5e979 Merge pull request #9690 from Kelenius/ofPuffsAndCleaner 
Of puffs and cleaner
 2015-06-05 20:02:08 +02:00
Kelenius
345cd7a738 Adds a simulated check to chempuffs 2015-06-05 19:20:46 +03:00
Kelenius
2ba5fd6af2 Merge branch 'dev-freeze' into ofPuffsAndCleaner 
Conflicts:
	code/game/objects/effects/chem/water.dm
 2015-06-05 14:36:15 +03:00
PsiOmegaDelta
979b6adcae Removes some qdel:s of lists. 
Primarily done by removing the need for clearing the contents list of bio-lockers in the first place.
 2015-06-05 12:05:43 +02:00
PsiOmegaDelta
7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
PsiOmegaDelta
c21985f39d Merge pull request #9679 from GinjaNinja32/humans_are_not_hats 
Removes briefcase instastun and crappy helmet check
 2015-06-05 10:17:02 +02:00
GinjaNinja32
67ccb6997b Entirely removes briefcase instastun and pointless New() definition 2015-06-05 09:00:19 +01:00
GinjaNinja32
2507a8007b Comments out a section that requires a single object to be both /mob/living/carbon/human and /obj/item/clothing/head 2015-06-05 01:10:15 +01:00
PsiOmegaDelta
2373eb4bdd Fixes #9664. 
Datum pool no longer creates a new object just for the sake of it when initializing pool lists.
Also bandaids an issue where water could be qdeled while being sprayed and reagents nulled, because someone calls spawn() qdel in new.
Datum pool now also adds excess pool objects on the trash pile instead of calling del directly.
 2015-06-04 14:42:39 +02:00
PsiOmegaDelta
65fc980b20 Stack splitting and cable merging fixes. 
Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
 2015-06-04 13:24:12 +02:00
Zuhayr
9d9efc336b Merge pull request #9649 from mwerezak/fixes 
Fixes
 2015-06-03 11:45:45 +09:30
mwerezak
45d60ab551 Fixes #9640 2015-06-02 22:00:34 -04:00
GinjaNinja32
c1cc002109 Merge pull request #9601 from Techhead0/survivalBox 
Survival box and job spawning fixes.
 2015-05-31 19:47:44 +01:00
Techhead0
9047bbe2a2 Removes O2 tank and spare mask from Vox boxes. 2015-05-31 14:17:24 -04:00
Chinsky
10218eb8c9 Merge pull request #9573 from Zuhayr/chairs 
Chair update.
 2015-05-31 11:33:24 +03:00
Zuhayr
201712eb3d Added MATERIAL_PADDING flag. 2015-05-31 17:19:32 +09:30
Zuhayr
fd2855800f Merge pull request #9582 from mwerezak/robolimbs 
limb fixes
 2015-05-31 17:14:25 +09:30
mwerezak
d541fda7be Sets w_class for external organs 
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
 2015-05-30 19:02:37 -04:00
Zuhayr
ae38961a65 Fixes #9551 2015-05-31 03:36:07 +09:30
Zuhayr
f9e99e1ee9 Fixes #9581 2015-05-31 03:34:29 +09:30
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
PsiOmegaDelta
12d1277925 Merge pull request #9577 from Zuhayr/dev-freeze 
Fixes
 2015-05-30 08:35:39 +02:00
Zuhayr
eaf7e6718d Merge pull request #9553 from GinjaNinja32/reagent_protection 
Fixes #5945, de-copy-pastes parapens and sleepypens
 2015-05-30 13:57:31 +09:30
Zuhayr
deb806c4cb Fixes #9076 2015-05-30 05:24:44 +09:30
Zuhayr
a3f3009eb4 Fixes #9063 2015-05-30 05:16:01 +09:30
Zuhayr
c5df326533 Fixes #9414 2015-05-30 03:15:19 +09:30
GinjaNinja32
cf722a2d34 Closes some span tags 2015-05-29 18:01:50 +01:00
Zuhayr
fa7c43bf39 Merge pull request #9549 from atlantiscze/bright-solution 
Refactor floodlights
 2015-05-30 02:11:10 +09:30
Zuhayr
3cf0018fb8 Fixing up bed icons etc. 2015-05-30 01:13:11 +09:30
Zuhayr
93aaa48cd8 Fixes #9571, various other tweaks. 2015-05-30 00:59:39 +09:30
Zuhayr
7d7723c19d Further material tweaks. 2015-05-30 00:45:58 +09:30
Zuhayr
e9f2f5cf55 Converted comfy chairs to material system, cleaned up colours/icons. 2015-05-30 00:45:36 +09:30
GinjaNinja32
86f52910a1 Fixes #5945, de-copy-pastes parapens and sleepypens 
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
 2015-05-28 22:23:37 +01:00
Atlantis
30e4550e2e Refactor floodlights 
- Fixes #9543
- Removes ugly floodlight/proc/updateicon() and replaces it with proper floodlight/update_icon() which is standard on all objects/items. Does the same refactor for power cells and adjusts the proc call in relevant files (hence the amount of 1-line changes in various files)
- Makes floodlights properly use CELLRATE. Their load is 200 watts. Cell adjusted accordingly, it starts with 1k cell, which is enough for ~40 minutes (roughly)
- Floodlights with almost discharged cell (less than 10%) ocassionally "flicker", dimming for few seconds. This serves as indicator that the power cell is running low.
- Floodlight luminosity adjusted. They now shine slightly more, espicially closer to the floodlight.
 2015-05-28 21:45:54 +02:00
Atlantis
7981777c41 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-28 20:16:12 +02:00
Kelenius
8a94211bb4 Chem puffs will now touch objects on tile before splashing on the mob 2015-05-28 18:29:07 +03:00
Chinsky
3d5b7e5744 Merge pull request #9464 from Kelenius/ofChemAndAnalyze 
Medical scanners now scan ingested reagents
 2015-05-27 06:32:20 +03:00
Kelenius
359e055463 Lets medical scanners scan stomach 2015-05-25 19:11:14 +03:00
mwerezak
c08774d96e Updates bear traps 
Moves to trap.dm.
Cleans up trap attacking code.
Fixes trap remaining anchored once triggered.
Instead of embedding, traps now buckle their victim into place.
Deaf messages, where appropriate.
Gave beartraps a more setting-friendly name.

Conflicts:
	baystation12.dme
 2015-05-24 16:33:41 -04:00
Atlantis
1da44dc861 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 
- Merge resolution: Updates intellicard NanoUI to correctly show separate hardware integrity/backup capacitor percentages.
 2015-05-24 20:23:46 +02:00