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

919 Commits

Author SHA1 Message Date
Kelenius
ea12fc664f Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
 2015-05-25 20:35:46 +03:00
Zuhayr
f0006ec6bf Removes redundant surgery for brain and eye repair, now covered by organ repair in general. 
Attempted to limit regular surgery to non-robotic limbs and added surgical steps for robotic limbs.
Readded checks for smoking reagent transfer.
Fixes, oversights, tweaks with IPC.
Added some reagent bypassing for NO_BLOOD and some checks to various affect_touch() calls for NO_SCAN/IPC.
Added prosthetic-scanning functionality to cyborg analyzer.
Added prosthetic analysis to the robot analyzer.
Allowed people with internal cells to charge in robot chargers (IPCs).
 2015-05-25 14:49:57 +09:30
Zuhayr
958494ae75 Removed IS_SYNTHETIC and REGENERATES_LIMBS flags. 
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
 2015-05-25 14:49:07 +09:30
Zuhayr
50dd6aa0bb Merge with master. 2015-05-23 21:29:40 +09:30
Zuhayr
a2571b95c3 Merge pull request #9418 from mwerezak/port-gen 
Fixes portable generators going above their temperature limit
 2015-05-23 20:40:07 +09:30
Kelenius
3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
 2015-05-22 19:26:39 +03: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
cf591c290b Adds limit to prevent random walking below the lower limit temperature, too. 2015-05-22 02:21:12 -04:00
mwerezak
4d54742079 Fixes portable generators going about their temperature limit 2015-05-22 01:27:01 -04:00
PsiOmegaDelta
66b8d67637 Merge pull request #9390 from mwerezak/attack-animation 
Attack animations
 2015-05-21 06:52:30 +02:00
Kelenius
35a20002c6 Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	baystation12.dme
	code/defines/obj/weapon.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_parts.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
	code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
	code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
	code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
	code/game/objects/items/weapons/circuitboards/machinery/power.dm
	code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
	code/game/objects/items/weapons/circuitboards/machinery/research.dm
	code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
	code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
	code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/assembly/voice.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/mining/drilling/scanner.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/ore.dm
	code/modules/mob/living/silicon/robot/analyzer.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
	code/modules/research/research.dm
	code/modules/research/server.dm
	code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
 2015-05-20 11:50:28 +03:00
mwerezak
87178d74a6 Adds attack animation calls for attack_generic() 2015-05-20 00:19:39 -04:00
mwerezak
defc4c1f94 Adds check_charge(), checked_use() 2015-05-18 20:09:09 -04:00
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +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
3d1b671703 Asking for more energy than a cell has stored now drains the cell. 
Fixes #9252.
 2015-05-13 23:38:49 +02:00
Chinsky
ad67215b08 Merge pull request #9073 from PsiOmegaDelta/QDels 
Implementing Destroy():s
 2015-05-12 18:26:57 +03:00
Chinsky
e9cc39039c Merge pull request #8946 from Zuhayr/miningstuff 
Wall refactor/mining changes.
 2015-05-12 13:13:31 +03:00
Zuhayr
b15ff78302 Merge pull request #9130 from mwerezak/device-powercell 
Adjusts charge cost for energy type guns
 2015-05-12 18:11:39 +09:30
PsiOmega
66ead991e7 Terminals, scrubbers, airlocks, and alarms get a Destroy() review. 2015-05-12 08:16:30 +02: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
Techhead0
0d9a482be8 Removes frame_desc from circuitboards. 2015-05-12 00:09:51 -04:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr
e28acd5045 Dev merge. 2015-05-11 18:45:14 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Mloc
7780287d3a mood lighting for computers 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:29 +01:00
Mloc
16d50c645d new object-based lighting system 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:25 +01:00
Mloc
733c6a4fb5 simulated var for atoms, used to filter explosions and other actions 
kind of a stronger anchored var, used by lighting overlays

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:30 +01:00
Mloc
5b92057890 lights in areas that don't require power will now automatically turn on 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:29 +01:00
Mloc
e602a7e286 remove the sub-area system 
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:29 +01:00
mwerezak
3e1e137cec Adds device powercells 
Adds a type of smaller power cell for powering devices. Not used by much
at the moment, but it's one step closer to a more coherent picture of
power cells.
 2015-05-06 23:41:57 -04:00
StarSmasher
4afe2e46e6 Updates code based off of GinjaNinja's Feedback 2015-05-05 17:16:10 +02:00
StarSmasher
2675bac50e Applies Icon Caching to battery racks, Fixed edition 
I did a whoops, should be good now, I hope.
 2015-05-05 16:50:23 +02:00
Mloc
82b810d363 Revert "Applies Icon Caching to battery racks" 2015-05-05 15:36:19 +01:00
StarSmasher
b27dbdaaf5 I'm too broken for this 
Also fixes this one, probably.
 2015-05-05 14:21:28 +02:00
StarSmasher
1c9dbfdb2b Removes unneeded variable 
All good now.
 2015-05-05 14:13:26 +02:00
StarSmasher
89b65e216f Applies Icon Caching to battery racks 
In my tests a while ago, I found that the battery racks came quite high in the profiler. So I decided to see if I could alleviate some of that trouble.

Very simple, caches the icons based off of previous work done on the APC, requires less processing for the icon updates.
Function has been tested and has been used on a live server for a few weeks prior to said server's shutdown.
Will make a 2nd PR following another like this except for HUD icons.
 2015-05-05 13:12:52 +02:00
PsiOmega
6f9da12276 Implementing Destroy():s 
First out: APCs, security camera consoles, vents.
 2015-05-03 10:45:35 +02:00
Chinsky
3d7bfd8aff Merge pull request #9007 from PsiOmegaDelta/Initialize 
Removes the need for spawn() in New() procs.
 2015-04-30 21:12:06 +03:00
PsiOmega
fcfdcecd3a initialize() should now always be called, be it on game starting up or object being created after game start. 
Partially fixes #9036.
 2015-04-30 19:28:35 +02:00
PsiOmega
f760d44127 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm
 2015-04-28 08:43:31 +02:00
Chinsky
afa82e5d83 Merge pull request #9003 from mwerezak/dev-fixes 
Fixes
 2015-04-28 06:26:22 +03:00
mwerezak
36d9944dfd Fixes #8977 2015-04-27 14:55:18 -04:00
mwerezak
290a7d5000 Fixes #8536 
Also removes a bunch of redundant comments
 2015-04-27 01:11:40 -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
79e3acc95e Finalized wall refactor. 2015-04-26 12:58:57 +09:30
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
e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00