cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 01:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,117 Commits 2 Branches 1 Tag
f3c9a7224b937da29a6d27f4f0a0f9960acc3a30
Commit Graph

19671 Commits

Author SHA1 Message Date
PsiOmegaDelta
f3c9a7224b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/reagents/reagent_containers/borghydro.dm
 2015-07-24 10:53:57 +02:00
PsiOmegaDelta
9b0497e01e Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-24 10:46:32 +02:00
Chinsky
90ae24dd1c Merge pull request #10135 from Kelenius/ofBorgsAndShakers 
Of borgs and shakers
 2015-07-23 21:41:48 +03:00
Chinsky
390bf93d4d Merge pull request #10261 from PsiOmegaDelta/150722-LawNumbering 
Fixes #10254.
 2015-07-23 21:01:33 +03:00
PsiOmegaDelta
aec2ed05dc Merge pull request #10247 from Kelenius/ofJanicartAndLabels 
Of janicart and labels
 2015-07-23 09:47:15 +02:00
PsiOmegaDelta
83289c1b78 Merge pull request #10273 from Kelenius/ofRobotsAndBoxes 
Of robots and boxes
 2015-07-23 09:15:46 +02:00
Kelenius
7efaab0ab4 Fixes #9540 - borg message when using DA on storage 
Radically. Frankly, this message is useless.
 2015-07-23 10:10:10 +03:00
PsiOmegaDelta
39a1b3e4ab Merge pull request #10272 from Baystation12/dev-freeze 
Dev freeze -> Dev
 2015-07-23 08:14:39 +02:00
Chinsky
135df023d3 Merge pull request #10265 from Kelenius/ofBeakersAndMicrowaves 
Of beakers and microwaves
 2015-07-22 20:31:45 +03:00
Mloc
30f448cdd2 Merge pull request #10253 from PJB3005/bay-lights 
Lighting: The sanicking
 2015-07-22 14:55:49 +01:00
Kelenius
b83afb10f8 Moves supply pack check down to atom 2015-07-22 13:05:26 +03:00
Kelenius
76fb9ca357 Fixes #9550 - beakers hit microwaves 2015-07-22 12:40:16 +03:00
Kelenius
b637030c21 Fixes #9209 - cargo manifests don't show contents 
This is a correct way of using initial() with a prototype that doesn't
create a new object
 2015-07-22 10:35:22 +03:00
PsiOmegaDelta
ec3faf35e8 Fixes #10254. 
Nothing to see here.
 2015-07-22 08:11:52 +02:00
Zuhayr
3579ab8373 Merge pull request #10259 from mwerezak/rig-module-fix 
Fixes #10151
 2015-07-22 10:45:21 +09:30
mwerezak
c7488c712b Fixes #10151 2015-07-21 20:34:39 -04:00
PJB3005
b6a1ee2adf Lighting: The sanicing 2015-07-21 15:58:39 +02:00
PsiOmegaDelta
d276d4b8f0 Merge pull request #10252 from Baystation12/dev-freeze 
Dev freeze -> Dev
 2015-07-21 14:42:16 +02:00
PsiOmegaDelta
9aa79bc6f1 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-21 14:25:46 +02:00
Kelenius
d509bdbbfe Uses capitalize() 2015-07-21 11:58:39 +03: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
Kelenius
6b2daae752 Fixes #6264 - labeling janicart messes its ui 
Janicart now uses nanoui and is immune to labeling screwing up its
interface
I've even resisted making pointless spacing changes this time!
 2015-07-20 16:27:58 +03:00
PsiOmegaDelta
d1ae6b275c Fixes #10244. 
Adds a return statement.
 2015-07-20 09:14:06 +02:00
PsiOmegaDelta
1b7ab38e79 There was a DMI name change evidently. 2015-07-20 08:35:43 +02:00
Kelenius
b6beb8c299 Admin logs for borg hypo 2015-07-20 09:31:02 +03:00
PsiOmegaDelta
388343a84e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/recharger.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob.dm
 2015-07-20 08:28:32 +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
Zuhayr
c4a8ad1156 Merge pull request #10206 from Kelenius/ofBruisesAndBandages 
Of bruises and bandages
 2015-07-19 20:15:47 +09:30
Zuhayr
a45d26079f Merge pull request #10239 from mwerezak/lighting-fix 
Fixes #10210
 2015-07-19 20:13:55 +09:30
PsiOmegaDelta
faa45bfa6f Merge pull request #10240 from mwerezak/machine-frame-fix 
Fixes #10218
 2015-07-19 10:57:17 +02:00
PsiOmegaDelta
cac095e53a Merge pull request #10237 from mwerezak/throw-mode 
Fixes #10230
 2015-07-19 10:55:56 +02:00
mwerezak
b5ed18e980 Fixes #10218 2015-07-19 00:36:18 -04:00
mwerezak
d3717a23a0 Removes unlimited_power var 
Redundant and only used in one place.
 2015-07-19 00:33:17 -04:00
mwerezak
ac2dd5f3ca Fixes #10210 2015-07-19 00:25:09 -04: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
Chinsky
dbca9f61fc Merge pull request #10234 from Baystation12/dev-freeze 
Dev freeze -> Dev
 2015-07-18 23:56:10 +03:00
Chinsky
f7871e6d08 Merge pull request #10231 from GinjaNinja32/spanclassbalance 
Fixes <span class='class>, makes Travis check it
 2015-07-18 23:55:15 +03:00
PsiOmega
b308e34388 Fixes #10170. 
Removes the bunsen burner completely. Was after the chem rework basically never referenced anyway.
 2015-07-18 22:51:20 +02:00
PsiOmegaDelta
23736bc42b Merge pull request #10233 from Baystation12/master 
Master -> Dev-freeze.
 2015-07-18 22:45:44 +02:00
GinjaNinja32
49f8d1e675 Merge pull request #10228 from PsiOmegaDelta/150718-ToxicPhoron 
Fixes #10220.
 2015-07-18 21:37:12 +01:00
GinjaNinja32
0c1aee8074 Fixes <span class='class>, makes Travis check it 2015-07-18 21:13:32 +01:00
Chinsky
3a40f4e539 Merge pull request #10225 from PsiOmegaDelta/150718-BurnItAway 
Fixes #10170.
 2015-07-18 22:57:06 +03:00
PsiOmegaDelta
8b769c5d24 Merge pull request #10195 from Kelenius/ofSpaceAndWounds 
Of space and wounds
 2015-07-18 20:04:39 +02:00
PsiOmega
67a6480941 Fixes #10220. 
For the sake of consistency between mapped in and created phoron canisters, if nothing else.
 2015-07-18 19:58:09 +02:00
PsiOmega
8aac45bc42 Fixes #10170. 
Overrides the AI attack proc.
Saving any  removal of burners for the dev branch due to merge concerns.
 2015-07-18 19:36:01 +02:00
Kelenius
4e2049ccaf Removes a colon 2015-07-18 14:53:35 +03:00
PsiOmega
7dc5e7e3af Compilation fixes. 2015-07-17 23:21:59 +02:00