cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-31 07:56:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,665 Commits 66 Branches 25 Tags
21f679ea8fb7e5645fddac363cb3ffbef87e3e4c
Commit Graph
27665 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Chinsky 3178111fb9 Merge pull request #11197 from SkyMarshal/dev 
Adds airless steel floor and blue carpet edge mapping prefabs.
 2015-09-27 02:58:21 +03:00
SkyMarshal c06c3cd245 Adds airless steel floor and blue carpet edge mapping prefabs. 2015-09-26 16:27:47 -07: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
PsiOmegaDelta 689a97825a Merge pull request #11194 from PsiOmegaDelta/dev 
Dev
 2015-09-26 08:56:42 +02:00
PsiOmega b3c5344cb3 Updates changelog. 2015-09-26 08:52:31 +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
PsiOmegaDelta 095f2c520d Merge pull request #11193 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-09-26 08:46:53 +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
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 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
Chinsky 82fe1fd213 Merge pull request #11179 from GinjaNinja32/ban-panel 
Add specific color for expired bans in ban panel, fix some formatting and a runtime
 2015-09-24 15:27:48 +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
GinjaNinja32 9be47c6374 Permabans do not expire, and we don't need to show expired when it's been manually lifted 2015-09-23 13:03:11 +01:00
GinjaNinja32 c707519d1f Add specific color for expired bans in ban panel, fix some formatting and a runtime 2015-09-23 12:58:39 +01:00
GinjaNinja32 280c932add fix traitor AIs not getting a law zero 2015-09-23 12:26:53 +01:00
PsiOmegaDelta b3b657ee37 Random maintenance dirt. 
The state of maintenance is now randomly generated.
This includes patches of oil, trash, spiderwebs, dirt, and so forth.

Utilizes a system which makes it possible to apply custom turf initializers per area.
 2015-09-22 14:53:04 +02:00
Chinsky d5906bd18f Merge pull request #11171 from PsiOmegaDelta/150921-OddTypo 
Type definition typo fix.
 2015-09-22 14:19:43 +03:00
PsiOmega de2e9e2d9a Odd typo fixes. 2015-09-21 20:31:47 +02:00
PsiOmegaDelta 6d12780b9b Merge pull request #11170 from PsiOmegaDelta/dev 
Dev
 2015-09-21 17:44:20 +02:00
GinjaNinja32 d0310837b2 Merge pull request #11168 from DeeUnderscore/malf-spelling-fix 
Minor spelling fix
 2015-09-21 16:38:25 +01:00
PsiOmega 9ddb8ec84c Map conflict fix. 2015-09-21 17:38:19 +02:00
PsiOmega 38c0251b6d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-21 17:35:49 +02:00
PsiOmegaDelta 140c39f949 Merge pull request #11169 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-09-21 17:35:16 +02:00
PsiOmega 8897365fb9 Map conflict fix. 2015-09-21 17:28:35 +02:00
PsiOmega 5b4c7340e4 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-21 17:26:19 +02:00
Daranz ebaa452c4c Fix spelling: 'its' in place of 'it's' 2015-09-21 15:37:22 +02:00
PsiOmegaDelta 8a1b414e28 Floor painter, turf, and decal tweaks. 
Makes several custom color definitions, utilized by the floor painter, floor tiles, decals, etc.
Colored floor turfs now use a white icon state and applies a color, similar to the corresponding decals. This ensures they have the same color tone (was slightly off previously).
Colored floor tiles also use a white icon state and color application.
Removes now unused item states.
 2015-09-21 15:14:13 +02:00
Zuhayr ca3c77213e Merge pull request #11165 from PsiOmegaDelta/150921-ChemistryAccess 
Map tweaks.
 2015-09-21 21:30:03 +09:30
PsiOmegaDelta 9b6d2d6e97 Map tweaks. 
Restores chemistry windoor access. Fixes #11160.
Makes xenobiology nanomed dispenser all access. Fixes #11163.
 2015-09-21 12:08:54 +02:00
Zuhayr 7d7f0da2ca Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable 
Species tweaks
 2015-09-21 19:08:53 +09:30
Chinsky 02661be540 Merge pull request #11136 from PsiOmegaDelta/150918-BiasedMeteors 
Meteor events are now direction biased.
 2015-09-21 11:54:10 +03:00
Chinsky 88a9fdb4d3 Merge pull request #11144 from Hubblenaut/master 
Fixes beds occasionally buckling in odd directions
 2015-09-21 11:50:17 +03:00
Chinsky 5243626724 Merge pull request #11157 from PsiOmegaDelta/150920-ThunderdomeExclamationmark 
Map tweaks.
 2015-09-21 11:49:47 +03:00
PsiOmegaDelta 40144779e9 Merge pull request #11162 from SkyMarshal/multi-z 
Updates/fixes stairs.
 2015-09-21 07:08:20 +02:00
Zuhayr af6627f6a4 Merge pull request #11161 from LightningIron/dev 
Masks work with internals again
 2015-09-21 14:08:27 +09:30
SkyMarshal 8b225e4ba6 Update to stairs. 2015-09-20 18:25:23 -07:00