cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-11 18:02:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,610 Commits 2 Branches 1 Tag
2d52f2eac72ea83044b596ce9310e1a4cc2e5a32
Commit Graph

3415 Commits

Author SHA1 Message Date
Chinsky
2d52f2eac7 Merge pull request #5365 from volas/master 
Fix infinite loop
 2014-06-27 01:14:36 +04:00
volas
4528f109a5 Fix infinite loop in freeform AI module 2014-06-25 23:09:21 +04:00
PsiOmega
906ef41522 The tactical closet now calls ..() in its New() proc, allows for swallowing items placed on-top among other things. 2014-06-25 18:32:48 +02:00
Zuhayr
65013ac5a1 Merge pull request #5325 from mwerezak/temperature-expose 
Fixes FEA temperature_expose() being used instead of ZAS fire_act().
 2014-06-23 00:19:15 +09:30
Mloc
af60005aad Merge pull request #5317 from comma/master 
Couple o fixes
 2014-06-22 11:13:29 +01:00
mwerezak
37e63dfcb0 Fixes FEA temperature_expose() being used... 
...instead of ZAS fire_act().
 2014-06-22 00:13:22 -04:00
Chinsky
b7832f862a Fixes #5311 2014-06-21 00:58:31 +04:00
Zuhayr
33fa88e27a Merge pull request #5309 from mwerezak/flashbang 
Fixes #5186
 2014-06-20 21:23:34 +09:30
mwerezak
25e333a39b Fixes #5186 2014-06-20 02:48:12 -04:00
Boop
4b7a8610b8 Fix latex gloves box not having the right sprite 2014-06-18 13:32:10 +01:00
Zuhayr
342bee81d4 Merge pull request #5284 from boopcat/happydrones 
more fixes!
 2014-06-18 08:58:00 +09:30
Boop
a903e400dd Fixes #5088 
also fixes more runtimes that mloc gave me
 2014-06-17 20:35:48 +01:00
Chinsky
dd4a937ca9 Merge pull request #5275 from GinjaNinja32/lighters 
Fixes cheap lighters burning body parts other than the hands they're being held in
 2014-06-17 14:43:24 +04:00
Chinsky
1ca6a54d3a Merge pull request #5265 from mwerezak/wound-fixes 
Fixes the wounding system
 2014-06-17 14:41:22 +04:00
GinjaNinja32
fcdd0198c0 Fix lighter burning random body parts 2014-06-17 04:50:14 +01:00
mwerezak
6dee9cf65d Adds sharp and edge flags to appropriate items 
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
 2014-06-16 13:26:44 -04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
 2014-06-15 20:25:39 -04:00
Zuhayr
5ad652e90c Fixes #5195 2014-06-14 18:48:13 +09:30
sick-trigger
2df8eca7cb Health analyzers display blood type 
Saves having to mess around with your PDA during a crisis (not really,
just grab that O- bag)
 2014-06-05 18:09:31 +10:00
sick-trigger
72ca3372b6 Airlock construction fix 
- door electronics now stay on mob until fully installed
- text fix
 2014-06-05 18:09:05 +10:00
mwerezak
a6bc516313 Readds flashes to all robots except drones. 
Drones also get a special low-power flashlight, now.
 2014-06-02 23:05:37 -04:00
Zuhayr
a7c3c67da8 Fixes #5098 2014-06-01 21:09:30 +09:30
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
Walter0o
2b372962c8 alien weeds performance and layer fixes 
recently i fixed a couple of issues with /vg/'s alien weeds and nodes, 
and i see some applying to Bay12 too.

one of those issues was the order of checks in weeds/Life().
it should cancel the weed's search for tiles to expand to without starting
the direction loop first, saving quite a few proc calls.

another issue is alien weeds having the default OBJ_LAYER layer 3 which makes them grow
over all kinds of items and objects which makes sense i guess fluffwise but
is really annoying ingame for both crew and aliens.
( and this coming from the host of Alium Deathtrap 13 ;) )
nodes stay at layer 3 to appear properly over things like AI-holopads.

a really tiny improvement is setting linked_node after the space-turf check in weeds/New().

link to the /vg/ commit : 4dcb434f72
 2014-05-29 19:02:17 +02:00
Zuhayr
a29861480a Fixes #5023 2014-05-28 16:35:06 +09:30
Zuhayr
dcbe9ce061 Merge pull request #5048 from Hubblenaut/dev-freeze 
Paper bundle fixes and other general game improvements
 2014-05-26 23:18:27 +09:30
Ccomp5950
ff0d667337 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2014-05-24 19:02:16 -05:00
Ccomp5950
3b8ee547c6 Merge pull request #5046 from mwerezak/lightbulb-box 
Fixes #5043
 2014-05-23 17:51:05 -05:00
mwerezak
c4e811829e Fixes #5043 2014-05-22 18:47:38 -04:00
mwerezak
71ad2b3aae Fixes bodybags not being able to be put back... 
...into their own box. Also affects folded cryobags.
 2014-05-22 16:44:26 -04:00
Hubblenaut
b54bc552e7 Personal closets are resettable with verb 'Reset Lock' 2014-05-20 01:25:06 +02:00
Mloc-Argent
e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
 2014-05-14 22:42:03 +01:00
Zuhayr
ce4f7d4708 Fixes #4979 2014-05-14 17:02:04 +09:30
bs12-bot
1f614c3149 Merge pull request #4971 from Ravensdale/and_yeah_he_doth_spake-let_there_be_light 
Fixes runtime with yellow slime extracts.
 2014-05-12 19:02:31 +01:00
Ccomp5950
bc21d1734c Merge pull request #4962 from mwerezak/internal-storage-ground-fix 
Internal storage fix
 2014-05-12 11:41:48 -05:00
Ravensdale
8e15a76da1 Fixes runtime with yellow slime extracts. 2014-05-12 01:15:45 -07:00
Mloc-Hibernia
d1d3620a12 fix another merge issue 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-05-11 13:56:17 +00:00
Mloc-Hibernia
f2924c9f57 Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons 2014-05-11 13:48:51 +00:00
Mloc-Hibernia
f606f35690 fix messy merge resolution 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
 2014-05-11 13:26:28 +00:00
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
 2014-05-11 13:19:09 +00:00
Loganbacca
f32d281132 Compressed matter implanter fix 
Compressed matter implanters will now correctly remove the compressed item from the game world if it is in an inventory (player or storage container).
 2014-05-11 18:30:18 +12:00
Mike
cee43ffbf3 Fixes internal storage on ground 
Fixes not being able to remove items from internal storage when the
master item is on the ground.
 2014-05-10 23:41:48 -04:00
Zuhayr
5e682668b2 Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 2014-05-10 02:10:06 +09:30
Zuhayr
1fc3ecf145 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-10 01:56:57 +09:30
Zuhayr
1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Zuhayr
8d6b5e6d5c Fixes #4911 2014-05-10 01:23:29 +09:30
Zuhayr
9f2f5fb488 Fixes #4808 2014-05-10 00:30:03 +09:30
Zuhayr
4d64af69f4 Fixes #4923 2014-05-09 21:29:44 +09:30
Mloc-Argent
a2b85c31a4 Merge remote-tracking branch 'upstream/master' into dev 2014-05-07 17:37:29 +01:00
Zuhayr
a1f6b7a211 Merge pull request #4885 from mwerezak/equipment-fixes 
Misc Equipment fixes - Mostly hardsuits
 2014-05-07 09:59:44 +09:30