cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 22:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,733 Commits 2 Branches 1 Tag
4413356a63849ec4e34ab00a1e1577283fbd5012
Commit Graph

5641 Commits

Author SHA1 Message Date
Chinsky
90ae24dd1c Merge pull request #10135 from Kelenius/ofBorgsAndShakers 
Of borgs and shakers
 2015-07-23 21:41:48 +03:00
PsiOmegaDelta
9aa79bc6f1 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-21 14:25:46 +02:00
Kelenius
83cc80b341 Fixes #9719 - dead goats retaliate 
Goats now only produce a message if they are alive
 2015-07-20 17:01:29 +03:00
PsiOmegaDelta
d1ae6b275c Fixes #10244. 
Adds a return statement.
 2015-07-20 09:14:06 +02:00
PsiOmegaDelta
ed2a49ba3e Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/stacks/medical.dm
 2015-07-20 08:20:40 +02:00
PsiOmegaDelta
c2010bd612 Merge pull request #10236 from mwerezak/robot-custom-icon 
Fixes #10215
 2015-07-19 12:56:00 +02:00
PsiOmegaDelta
8703bcb72d Merge pull request #10238 from mwerezak/sleepygas 
Fixes #9868
 2015-07-19 12:55:25 +02:00
PsiOmegaDelta
cac095e53a Merge pull request #10237 from mwerezak/throw-mode 
Fixes #10230
 2015-07-19 10:55:56 +02:00
mwerezak
4ea1379b33 Fixes #10230 
Moves throw mode procs up to /mob level, clicking on a non-turf or an
atom that is not in a turf cancels throw mode.
 2015-07-18 23:27:09 -04:00
mwerezak
428138af87 Fixes #10215 
Robot custom sprite config entries are now split at the first dash,
instead of at every dash.
The config is parsed once at startup.
 2015-07-18 23:05:40 -04:00
PsiOmegaDelta
23736bc42b Merge pull request #10233 from Baystation12/master 
Master -> Dev-freeze.
 2015-07-18 22:45:44 +02:00
PsiOmegaDelta
8b769c5d24 Merge pull request #10195 from Kelenius/ofSpaceAndWounds 
Of space and wounds
 2015-07-18 20:04:39 +02:00
Kelenius
4e2049ccaf Removes a colon 2015-07-18 14:53:35 +03:00
PsiOmega
d1a05d9fd6 Compilation fixes. 2015-07-17 23:11:42 +02:00
PsiOmega
b4d15ceb6e Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/inventory.dm
 2015-07-17 23:09:24 +02:00
HarpyEagle
bcd81af4f6 Bandaid fix for sealed rig removal 2015-07-16 10:52:26 -04:00
GinjaNinja32
6ec39e1f51 Fixes 'plural' gender and fixes some instances of not using the t_* variables 
Todo: fully rework this to not need lots of t_* variables, they're annoying and kinda crappy. Maybe a gender datum; /datum/gender/male/var/he = "he" or something.
 2015-07-15 19:00:54 +01:00
Kelenius
b8a354467e Fixes #9967 
Pulling someone through space or an area without gravity will no longer
deal damage to them
 2015-07-15 18:27:27 +03:00
GinjaNinja32
e2d7fd9e14 removes isAI() from broken merge 2015-07-15 15:45:55 +01:00
Zuhayr
c6d095aef1 Fixes #10118 2015-07-15 06:46:21 +09:30
PsiOmegaDelta
8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-07-14 08:11:11 +02:00
Zuhayr
b12d1d4bdd Refactors spiderbots a little, cleans up some spans, updates them. 2015-07-14 06:56:52 +09:30
Zuhayr
5e1ae26b74 Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze. 2015-07-14 05:19:01 +09:30
Zuhayr
af7c87366e Fixes #10137 2015-07-14 05:18:57 +09:30
HarpyEagle
a93adb2710 Fixes #9868 2015-07-13 11:27:15 -04:00
Ccomp5950
e6481d4a2c Merge pull request #10168 from Kelenius/ofCowsAndTables 
Fixes #8294
 2015-07-13 10:03:38 -04:00
Kelenius
765731f7d5 Fixes #8294 
Fuck mobcode.
 2015-07-13 16:51:46 +03:00
Kelenius
79804f663e Updates borg shaker and hypospray 
Fixes #6937
Hypospray no longer contains a bunch of reagent holders
 2015-07-12 19:50:02 +03:00
GinjaNinja32
b04ed47e2f Merge pull request #10070 from Mloc/lightwrite-2 
Lighting overlay changes + optimizations
 2015-07-12 15:51:44 +01:00
Mloc
278a4c38ec get rid of mob.see_in_dark and species.darksight 
They don't work with the current lighting system and cause weird artifacts.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-09 19:17:04 +01:00
Chinsky
c7d9ce4697 Merge pull request #10046 from mwerezak/custom-item-icons 
Makes custom items use the host item's inhand sprites if none are provided, knife fixes
 2015-07-09 20:52:38 +03:00
Chinsky
7d9b7e10f4 Merge pull request #10038 from PsiOmegaDelta/150707-HellUniverseOptimizations 
Reduced Hell Universe Lag
 2015-07-09 20:45:51 +03:00
Zuhayr
07bd7ef684 Fixes #9610 2015-07-10 00:06:07 +09:30
Mloc
ffbf547923 Merge pull request #9889 from PJB3005/bay-lights 
Lighting optimizations + NVG meson fix
 2015-07-09 14:50:10 +01:00
Kelenius
12fdb7521a Fixes #9908 2015-07-09 11:29:49 +03:00
PsiOmegaDelta
3751e1cdbf Merge pull request #10055 from Zuhayr/dev-freeze 
Fixes.
 2015-07-09 08:35:06 +02:00
PsiOmegaDelta
14acf43646 Merge pull request #10059 from Baystation12/master 
Dev-freeze
 2015-07-09 08:34:43 +02:00
Zuhayr
9d02b41ae7 Emergency workaround for the observer bug. 2015-07-09 11:01:42 +09:30
Zuhayr
e4fdf84ef7 Fixes #10054, fixes some mushroom issues. 2015-07-09 04:25:36 +09:30
mwerezak
8957412826 Custom items default to the inhands of the parent 
Makes custom items use the inhand states and icons of the parent item
type if inhand states are not present in CUSTOM_ITEM_MOB.
Makes item_icons take precedence over icon_override for inhands only.
 2015-07-08 01:39:02 -04:00
PsiOmegaDelta
0a4131e9dc Reduced Hell Universe Lag 
Based on https://github.com/d3athrow/vgstation13/pull/5273.
 2015-07-07 12:55:39 +02:00
Zuhayr
2129bf6c2e Merge pull request #10014 from mwerezak/raider-gear 
Fixes issues with equipping raiders, raider gun type
 2015-07-06 05:48:25 +09:30
mwerezak
c1bbc5c3a6 Fixes issues with raider equipping 
Fixes raiders not being able to ever spawn with guns that cannot be equipped to the belt, despite those gun types being in the raider_guns list.
Fixes raiders spawning with guns for which they have no ammo.
Fixes taj/unathi raiders having a 2/3 chance of spawning without any shoes.
 2015-07-04 16:32:35 -04:00
PsiOmegaDelta
fb60cfde4c Rejuvenation now clears chemicals in mobs. 
Fixes #9921.
 2015-07-03 16:41:10 +02:00
GinjaNinja32
88b9787ac4 Merge pull request #9991 from PsiOmegaDelta/150702-MyHandYourPocket 
Fixes #9986.
 2015-07-02 13:55:27 +01:00
GinjaNinja32
a2e66b4095 Merge pull request #9989 from PsiOmegaDelta/150702-St-St-StutteringFi-Fi-Fix 
Speech impediment fixes.
 2015-07-02 13:54:16 +01:00
Zuhayr
de39dbd1bb Merge pull request #9973 from PsiOmegaDelta/150630-SinglePortableUnit 
Portable turret changes.
 2015-07-02 18:36:13 +09:30
PsiOmegaDelta
db1135169d Fixes #9986. 
A simple matter of a missing return line.
 2015-07-02 10:43:22 +02:00
PsiOmegaDelta
a98c4a2c8e Speech impediment fixes. 
Fixes #9987.
Removes unnecessary speech problem flag check.
Removes unnecessary changeling language check. Hivemind languages are excluded from speech problems already.
 2015-07-02 10:04:08 +02:00
PsiOmegaDelta
977ed13e14 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
 2015-07-01 22:35:00 +02:00