cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,716 Commits 5 Branches 0 Tags
8ce01aa6488fcdedfa664b421c7c5ef6771d7fee
Commit Graph

20848 Commits

Author SHA1 Message Date
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
GinjaNinja32
5ef5f40cbe add 'info' topic command to get information on a character 2015-10-02 12:45:19 +01: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
GinjaNinja32
11141462a0 fix #11222 
also fixes the name and adds feedback to adding items
 2015-09-30 00:00:36 +01:00
PsiOmegaDelta
357c716a2b Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-29 11:52:48 +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
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
GinjaNinja32
c8eb26326a Merge pull request #11208 from mwerezak/firemode-cleanup 
Fixes #10850
 2015-09-28 11:41:03 +01: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
PsiOmega
63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +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
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
Joseph Heinemeyer
9e9df0a15d Delete ladders.dm 2015-09-26 17:43:52 -07:00
SkyMarshal
144dbebb2d Multi-z fixes. 2015-09-26 17:39:16 -07:00
SkyMarshal
c06c3cd245 Adds airless steel floor and blue carpet edge mapping prefabs. 2015-09-26 16:27:47 -07:00
Hubblenaut
f0481b551e Fixes grab-buckling overwriting pixelshift 2015-09-26 14:11:01 +02:00
PsiOmega
a3b9ab1236 Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection. 2015-09-26 09:19:58 +02:00
PsiOmega
709840f848 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/DB ban/functions.dm
 2015-09-26 08:48:37 +02:00
PsiOmega
145d8d91ef Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/_helpers/unsorted.dm
 2015-09-26 08:43:06 +02:00
GinjaNinja32
c987fedc24 Merge pull request #11180 from BlueNexus/patch-1 
Gave Asset Protection their proper rig
 2015-09-25 14:09:28 +01:00
PsiOmegaDelta
11a03abbf7 Makes more external sources of radiation respect rad-protection. 
More radiation sources now use the apply_effects() proc to increase rad levels, as this proc respects radiation protective gear (such as radiation suits).
Does not affect internal sources, such as food, injections, etc.
 2015-09-25 15:02:20 +02:00
PsiOmegaDelta
613b2486ca Map tweaks. 
Fixes issues with colored floor tiles having their item state reset, appearing black IG.
Pipe fixes and state cleanup. Floor plating under doors cleanup.
 2015-09-25 14:05:39 +02:00
Chinsky
dbbf6bb11e Merge pull request #11158 from PsiOmegaDelta/150920-MoreGlow 
Glowy items.
 2015-09-25 15:03:39 +03:00
Chinsky
0ce1495a12 Merge pull request #11178 from GinjaNinja32/lawzero 
fix traitor AIs not getting a law zero
 2015-09-25 11:46:40 +03:00
Chinsky
407f5bbac3 Merge pull request #11182 from Hubblenaut/dev 
Lowers the belt layer to below suit
 2015-09-25 11:45:57 +03:00
PsiOmegaDelta
9dd1a54191 Destroy tweaks. 
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
 2015-09-25 10:44:23 +02:00
PsiOmegaDelta
509486dbd9 Merge pull request #11181 from GinjaNinja32/crash_with 
Add proc/crash_with, fix two incorrect qdel calls
 2015-09-25 06:31:38 +02:00
Hubblenaut
8d3519e24b Belt layer below suit layer, belts toggleable 2015-09-24 17:48:14 +02:00
Chinsky
36e61e45bf Merge pull request #11173 from PsiOmegaDelta/150922-AutoDirt 
Random maintenance debris, junk and dust.
 2015-09-24 15:29:19 +03:00
Chinsky
60a925422f Merge pull request #11167 from PsiOmegaDelta/150921-ColorCleanup 
Floor painter, turf, and decal tweaks.
 2015-09-24 15:27:58 +03:00
PsiOmegaDelta
e74d586c99 Merge pull request #11186 from Baystation12/dev-freeze 
Dev
 2015-09-24 08:26:42 +02:00
PsiOmegaDelta
61a4d3b7af Merge pull request #11185 from Baystation12/master 
Dev-freeze
 2015-09-24 08:17:45 +02:00
BlueNexus
76f06e6e9b Gave Asset Protection their proper rig 
Fairly self explanatory.
 2015-09-23 13:29:54 +01:00
GinjaNinja32
8ed4faf7b2 Add proc/crash_with, fix two incorrect qdel calls 2015-09-23 13:29:54 +01:00