cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-31 16:06:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,544 Commits 66 Branches 25 Tags
c192378bab4165c66c7ffdd7c92c91d0d572e57e
Commit Graph
5862 Commits
Author SHA1 Message Date
Neerti ecaf6758df Begins work on new ling. 2015-08-20 11:38:48 -04:00
Neerti d911badae8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge 
Conflicts:
	.travis.yml
	polaris.dme
 2015-08-07 20:25:57 -04:00
PsiOmegaDelta 863832b347 Post-merge fixes. 
Renames define.
Re-corrects access checks.
 2015-08-06 08:18:39 +02:00
PsiOmegaDelta 03578d4ea3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-06 08:12:38 +02:00
PsiOmegaDelta 87fcd408bd Merge pull request #10436 from mwerezak/cult-construct-nightvision 
Adds nightvision to cult constructs
 2015-08-06 06:38:49 +02:00
mwerezak e5950d32d8 Merge pull request #10264 from RavingManiac/dev-freeze 
Refactors floating and magboot checks. Fixes #10256
 2015-08-05 23:05:34 -04:00
PsiOmegaDelta 73a9c24017 Removes code in mob/living/bot/Life() that is now handled by mob/living/Life(). 2015-08-05 09:26:43 +02:00
PsiOmegaDelta 3e266ab377 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-05 09:25:53 +02:00
PsiOmegaDelta 6b01a67c50 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm
 2015-08-05 09:16:50 +02:00
GinjaNinja32 c71d78ab1a add debug verb as pAI-spawning adminverb 2015-08-05 00:50:04 +01:00
GinjaNinja32 117ffca6d0 Merge pull request #10423 from Kelenius/ofBotsAndZAS 
Of bots and ZAS
 2015-08-04 13:26:30 +01:00
GinjaNinja32 9a4b53c765 Merge pull request #10360 from atlantiscze/beep-beep-beepsky 
Fixes #10355
 2015-08-04 12:36:35 +01:00
PsiOmegaDelta 93011f94c4 Merge pull request #10425 from Baystation12/dev-freeze 
Dev
 2015-08-04 13:07:11 +02:00
Kelenius e935baf1d8 Fixes #10418 - bots don't remover from stuns 2015-08-04 12:41:32 +03:00
Neerti 95240c989b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync 
Conflicts:
	polaris.dme
 2015-08-03 22:13:18 -04:00
RavingManiac aeea42ded9 Refactors floating and magboot checks. Fixes #10256 2015-08-03 23:19:04 +10:00
PsiOmegaDelta 34ad83baae Removes debug proc. 
It isn't needed.
 2015-08-03 09:31:40 +02:00
Atlantis ad45e5d16b Implements req_one_access for bots, as per request on GitHub discussion. 2015-08-02 23:23:18 +02:00
PsiOmega f8d86900a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm
 2015-08-01 19:45:42 +02:00
Zuhayr 840b5b756b Fixes #10358, #10359 and #10257 2015-08-01 23:17:27 +09:30
Zuhayr 2a51b778d6 Fixes #9611 2015-08-01 21:10:48 +09:30
Mloc f04ca77bfb revert chargen rendering rework 
fixes #9733

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-08-01 11:35:53 +01:00
HarpyEagle 924d8fac74 Adds nightvision to cult constructs 2015-07-31 16:33:07 -04:00
PsiOmegaDelta 7e6cb6f38c Compilation/definition fixes. 2015-07-31 10:05:42 +02:00
PsiOmegaDelta c28b3721b4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-07-31 10:00:16 +02:00
mwerezak 47d30a49a0 Fixes #10389 
Allows glasses to set the see_invisible of their wearer.
 2015-07-31 01:33:43 -04:00
Mloc 8578c08236 fixes #10374 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 22:46:54 +01:00
Mloc 8cf9e32c2e Merge pull request #10361 from atlantiscze/tiny-little-logspammers 
Fixes #10356
 2015-07-30 19:24:24 +01:00
PsiOmegaDelta 93e914f021 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/setup.dm
 2015-07-30 10:49:37 +02:00
PsiOmegaDelta b6bd51828a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/admin/admin_verbs.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2015-07-30 10:38:44 +02:00
Atlantis 55e41b9afd Fixes #10356 
- Maintenance drone law reset no longer spam admin's logs.
 2015-07-29 20:19:31 +02:00
Atlantis b80dad0329 Fixes #10355 
- Bots can now be unlocked when you have one of the required accesses, instead of requiring all of them.
- In other words, security officers can once again unlock beepsky. I believe no other bot uses more than one access level for unlocking.
 2015-07-29 19:58:01 +02:00
Chinsky e17b8be47e Merge pull request #10344 from GinjaNinja32/cult-gender 
His book? Her book.
 2015-07-29 14:37:16 +03:00
Neerti 8152ce0676 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/29/2015_bay_sync 
Conflicts:
	polaris.dme
 2015-07-29 03:45:53 -04:00
mwerezak 6df770cab3 Fixes projectiles being able to hit humans in organs they do not have. 
Will also prevent body shields blocking bullets with non-existant limbs. Expands on the special return values for bullet_act(), adds defines for them.
 2015-07-28 20:23:26 -04:00
mwerezak d203362d38 Fixes #10258 
Turrets now aim at the chest/groin unless the target has a neck grab on someone, otherwise they aim elsewhere.
Projectiles are now able to miss targets that are lying or buckled, except when the target is at point blank range and is the original target for the projectile.
 2015-07-28 20:17:32 -04:00
GinjaNinja32 74f04671f8 His book? Her book. 2015-07-28 13:37:15 +01:00
PsiOmegaDelta 2387b88507 Compilation fixes. 2015-07-28 09:06:08 +02:00
PsiOmegaDelta 0ab507ccec Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-07-28 09:03:49 +02:00
PsiOmegaDelta 0bf3c39095 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-07-28 07:59:49 +02:00
PsiOmegaDelta ff2b3865b8 Compilation fixes. 2015-07-27 10:41:21 +02:00
Zuhayr c5c7dddf63 Merge pull request #9979 from mwerezak/camera-console-fix 
More check_eye() fixes
 2015-07-27 17:56:03 +09:30
PsiOmegaDelta 5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm
 2015-07-27 10:20:20 +02:00
PsiOmegaDelta 0838de3ba2 Compilation fixes. 2015-07-27 10:03:31 +02:00
PsiOmegaDelta c159f4657a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/inventory.dm
 2015-07-27 09:53:08 +02:00
PsiOmegaDelta c44f5916df Merge pull request #10323 from mwerezak/accessory-fix 
Fixes #9326
 2015-07-27 09:36:02 +02:00
Zuhayr e0429af2f7 Added config option for initial brain organ health. 2015-07-27 15:33:54 +09:30
Kearel f4aa2376c8 Initial fixes 
Changes interaction between stumps and items.
 2015-07-26 22:13:46 -05:00
Zuhayr 64ccd8a048 Merge pull request #10269 from Mloc/lightwrite 
lighting work
 2015-07-27 11:41:14 +09:30
Neerti 94a2ec5bf1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2 
Conflicts:
	.travis.yml
	polaris.dme
 2015-07-26 16:01:27 -04:00