cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-23 00:22:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,557 Commits 2 Branches 1 Tag
978384871706cb471192fdd982b51a8da2cad0c0
Commit Graph

13989 Commits

Author SHA1 Message Date
Chinsky
0753429740 Updates ToR list URL 2015-07-25 03:27:46 +03:00
PsiOmegaDelta
74872e28a7 Compilation fix. 2015-07-24 11:02:39 +02:00
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
Kearel
4f3818e408 Modified bookshelf wood spawning code 2015-07-24 00:18:24 -05:00
Kearel
94df140755 Library changes 
-Added ability to build/dismantle book shelves using wood or a
screwdriver, respectively.
-Added ability to move book shelves using a wrench.
-Added buttons to library computer to help sort the list of books
available.
 2015-07-23 23:48:26 -05:00
Chinsky
90ae24dd1c Merge pull request #10135 from Kelenius/ofBorgsAndShakers 
Of borgs and shakers
 2015-07-23 21:41:48 +03:00
PsiOmegaDelta
39a1b3e4ab Merge pull request #10272 from Baystation12/dev-freeze 
Dev freeze -> Dev
 2015-07-23 08:14:39 +02:00
Mloc
26a4e12cd2 make lighting falloff a macro and optimize turfs-in-view 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-22 16:22:28 +01:00
Mloc
65ac3d97d0 Revert "get rid of mob.see_in_dark and species.darksight" 
This reverts commit 278a4c38ec.
 2015-07-22 15:14:40 +01:00
Mloc
30f448cdd2 Merge pull request #10253 from PJB3005/bay-lights 
Lighting: The sanicking
 2015-07-22 14:55:49 +01: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
PsiOmegaDelta
617db485ee qdel/Destroy entries. 2015-07-21 14:22:01 +02:00
PsiOmegaDelta
1c7b860783 Spells are now restored when cloning. 2015-07-21 11:34:26 +02:00
PsiOmegaDelta
616b4b60e4 Magical fixes. 
The wizard den is no longer pitch black.
Fixes targeted spells using the wrong caster/source.
Adds some missing checks using the caster source above.
Re-logging should no longer cause a loss of spell UI icons.
Mind transfer should no longer cause unintended spell loss.
 2015-07-21 11:34:25 +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
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
a45d26079f Merge pull request #10239 from mwerezak/lighting-fix 
Fixes #10210
 2015-07-19 20:13:55 +09:30
PsiOmegaDelta
cac095e53a Merge pull request #10237 from mwerezak/throw-mode 
Fixes #10230
 2015-07-19 10:55:56 +02: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
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
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
PsiOmega
34b0517578 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/topic.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/nano/modules/atmos_control.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
 2015-07-17 23:19:34 +02: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
PsiOmegaDelta
7b454f193b Ensures the drone console use the new overlay system. 2015-07-17 08:14:13 +02:00
Neerti
6eece8ac45 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2 
Conflicts:
	.travis.yml
	polaris.dme
 2015-07-16 22:46:53 -04:00
HarpyEagle
bcd81af4f6 Bandaid fix for sealed rig removal 2015-07-16 10:52:26 -04:00
PsiOmegaDelta
dadb262ea1 Merge pull request #10192 from Kelenius/ofImprinterAndProhon 
Of imprinter and prohon
 2015-07-16 08:36:17 +02:00
Dragor
697157a6bc Changes all gun names to generic descriptive names, moves names into desc. Updates the descriptions of various guns to be more loreful. 2015-07-15 22:08:21 -04:00
GinjaNinja32
bb85ef62b4 Changes gender-based words to use a datum list instead of switches. 2015-07-15 20:04:33 +01:00