Hubblenaut
|
ba19c28c33
|
Adds laundry basket
|
2015-10-09 17:03:41 +02:00 |
|
PsiOmegaDelta
|
8ce01aa648
|
Merge pull request #11240 from PsiOmegaDelta/dev
Dev
|
2015-10-04 17:59:30 +02:00 |
|
PsiOmegaDelta
|
f249bf3bcc
|
Compilation fixes.
|
2015-10-04 17:48:41 +02:00 |
|
PsiOmegaDelta
|
96a90bb5e7
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
|
2015-10-04 17:41:02 +02:00 |
|
PsiOmegaDelta
|
f4be4c0ad9
|
Merge pull request #11238 from Baystation12/master
Dev-freeze
|
2015-10-04 17:31:44 +02:00 |
|
PsiOmegaDelta
|
07274733af
|
Merge pull request #11236 from LachBee/rescue-rig-in-cmo-office
Added rescue rig and rack to CMO office
|
2015-10-04 14:45:27 +02:00 |
|
LachBee
|
1903879660
|
Added rescue rig and rack to CMO office
|
2015-10-04 18:39:32 +08:00 |
|
PsiOmegaDelta
|
a3b8ab3b17
|
Merge pull request #11233 from GinjaNinja32/info
add 'info' topic command to get information on a character
|
2015-10-03 09:59:07 +02:00 |
|
Chinsky
|
05e470e81b
|
Merge pull request #11232 from PsiOmegaDelta/151002-VisibleNightvision
Adds offline on-mob NVG sprites.
|
2015-10-03 01:28:42 +03:00 |
|
GinjaNinja32
|
5ef5f40cbe
|
add 'info' topic command to get information on a character
|
2015-10-02 12:45:19 +01:00 |
|
PsiOmegaDelta
|
4fdf4afa08
|
Adds on-mob NVG sprites.
Fixes #10965.
|
2015-10-02 08:56:34 +02:00 |
|
PsiOmegaDelta
|
ce7079379f
|
Merge pull request #11227 from Vivalas/briefcase-fix
Briefcase Fix
|
2015-10-01 08:52:49 +02:00 |
|
Vivalas
|
8b6650d217
|
Briefcase Fix
|
2015-09-30 17:10:57 -05:00 |
|
mwerezak
|
4dc7ff8e9c
|
Merge pull request #11223 from GinjaNinja32/11222
fix #11222
|
2015-09-30 13:43:47 -04:00 |
|
PsiOmegaDelta
|
9f33920a9c
|
Merge pull request #11226 from Baystation12/dev-freeze
Dev
|
2015-09-30 08:34:54 +02:00 |
|
PsiOmegaDelta
|
d2f7a6e036
|
Merge pull request #11225 from Baystation12/master
Dev-freeze
|
2015-09-30 08:27:16 +02:00 |
|
GinjaNinja32
|
11141462a0
|
fix #11222
also fixes the name and adds feedback to adding items
|
2015-09-30 00:00:36 +01:00 |
|
GinjaNinja32
|
c2b56a5f36
|
Merge pull request #11214 from Dibasic/patch-1
changelog.css readability and redundancy
|
2015-09-29 17:13:17 +01:00 |
|
PsiOmegaDelta
|
fafcf7385b
|
Merge pull request #11218 from PsiOmegaDelta/dev
Dev
|
2015-09-29 12:12:15 +02:00 |
|
PsiOmegaDelta
|
dfdd33fcd2
|
Updates Travis' macro count.
|
2015-09-29 11:58:15 +02:00 |
|
PsiOmegaDelta
|
357c716a2b
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
|
2015-09-29 11:52:48 +02:00 |
|
PsiOmegaDelta
|
471b973724
|
Merge pull request #11217 from PsiOmegaDelta/dev-freeze
Dev freeze
|
2015-09-29 11:35:42 +02:00 |
|
PsiOmegaDelta
|
86223d65bf
|
TODO done.
|
2015-09-29 11:28:31 +02:00 |
|
PsiOmegaDelta
|
597631687b
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
|
2015-09-29 11:26:42 +02:00 |
|
mwerezak
|
a46af13c7e
|
Merge pull request #11213 from PsiOmegaDelta/150928-GhostInTheMachine
The silicon law manager now only requires the host to be conscious.
|
2015-09-29 00:00:31 -04:00 |
|
mwerezak
|
f604a61d62
|
Merge pull request #11212 from PsiOmegaDelta/150928-FewerLayersOfProtectionForYourEnjoyment
Removes double-layered Chemistry windoor.
|
2015-09-28 23:00:06 -04:00 |
|
PsiOmegaDelta
|
d77bcd7937
|
The silicon law manager now only requires the host to be conscious.
This should mean that the law manager is available even for carded AIs, even with the wireless interface disabled. Fixes #11139.
|
2015-09-28 21:23:10 +02:00 |
|
Dibasic
|
a65daf42fb
|
changelog.css readability and redundancy
Removed redundant CSS lines, fixed "Baystation 12 Credit List" font, and added line breaks and indentation to blocks with more than one line.
|
2015-09-28 10:47:00 -05:00 |
|
GinjaNinja32
|
c8eb26326a
|
Merge pull request #11208 from mwerezak/firemode-cleanup
Fixes #10850
|
2015-09-28 11:41:03 +01:00 |
|
PsiOmegaDelta
|
eb28b1f304
|
Removes double-layered Chemistry windoor.
Seems a bit excessive to have two windoors on the same location.
|
2015-09-28 12:01:25 +02:00 |
|
mwerezak
|
19de8545af
|
Merge pull request #11210 from DeeUnderscore/cloner-ding
Make cloners announce cloning completion with a ding.
|
2015-09-27 18:50:59 -05:00 |
|
GinjaNinja32
|
68ead3c410
|
Merge pull request #11206 from PsiOmegaDelta/150927-AdminCheckRuntime
has_admin_rights() improvement.
|
2015-09-27 22:37:53 +01:00 |
|
mwerezak
|
13c184c2a8
|
Fixes #10850
|
2015-09-27 14:13:37 -04:00 |
|
Daranz
|
b881d4055f
|
Make cloners go 'DING!' when ejecting clones
|
2015-09-27 13:55:37 -04:00 |
|
PsiOmega
|
e0951b1cf9
|
has_admin_rights() improvement.
Now calls the check_rights() proc, which handles all checks for us.
|
2015-09-27 17:05:15 +02:00 |
|
Zuhayr
|
d1d28b3da5
|
Merge pull request #11201 from PsiOmegaDelta/150927-TurfInit
Turf initialization tweaking.
|
2015-09-27 22:19:08 +09:30 |
|
PsiOmegaDelta
|
593566f171
|
Merge pull request #11203 from PsiOmegaDelta/dev
Dev
|
2015-09-27 13:57:13 +02:00 |
|
PsiOmega
|
63de1764c3
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
|
2015-09-27 13:48:33 +02:00 |
|
PsiOmegaDelta
|
07f03ca978
|
Merge pull request #11202 from PsiOmegaDelta/dev-freeze
Dev freeze
|
2015-09-27 13:47:12 +02:00 |
|
PsiOmega
|
807e7bf954
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/spells/artifacts.dm
|
2015-09-27 13:36:56 +02:00 |
|
PsiOmega
|
fa6319d52d
|
Turf initialization tweaking.
Removes the need for a spawn() in New().
|
2015-09-27 13:18:18 +02:00 |
|
Chinsky
|
c3d6fd07fd
|
Merge pull request #11199 from mwerezak/paper-gender
Fixes #11196
|
2015-09-27 13:02:59 +03:00 |
|
Chinsky
|
7ad55e0197
|
Merge pull request #11200 from mwerezak/sojourner
Fixes #11130
|
2015-09-27 13:02:50 +03:00 |
|
Chinsky
|
bbffe51844
|
Merge pull request #11192 from Hubblenaut/master
Fixes grab-buckling overwriting pixelshift
|
2015-09-27 13:01:56 +03:00 |
|
Zuhayr
|
d1e2257218
|
Merge pull request #11189 from PsiOmegaDelta/150925-BrokenFloor
Map tweaks.
|
2015-09-27 15:05:56 +09:30 |
|
HarpyEagle
|
380b89fcc0
|
Fixes #11130, renames aghosted var
because it is no longer used solely for aghosting.
|
2015-09-26 20:48:13 -05:00 |
|
HarpyEagle
|
592c824837
|
Changes paper and paper bundle gender, plus rename
|
2015-09-26 20:27:57 -05:00 |
|
mwerezak
|
03cb79a85d
|
Merge pull request #11187 from PsiOmegaDelta/150925-Destruction
Destroy tweaks.
|
2015-09-26 20:22:01 -05:00 |
|
mwerezak
|
21f679ea8f
|
Merge pull request #11191 from PsiOmegaDelta/150925-RadioActivity
Makes more sources of radiation respect rad-protection.
|
2015-09-26 20:10:47 -05:00 |
|
mwerezak
|
7abde2260b
|
Merge pull request #11198 from SkyMarshal/dev
Multi-z fixes.
|
2015-09-26 20:00:37 -05:00 |
|