cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,518 Commits 7 Branches 0 Tags
c63f4c62b51507e2de577863478638b6b21a41f2
Commit Graph

5887 Commits

Author SHA1 Message Date
mwerezak
0ceb0e291d Fixes #10314 
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
 2015-08-02 00:01:10 -04: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
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
mwerezak
7157cc1748 Fixes #9326 2015-07-26 14:57:49 -04:00
GinjaNinja32
167b1183ef Fixes 'Fixes sealed rig removal exploit' 2015-07-26 05:47:04 +01: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
Chinsky
90ae24dd1c Merge pull request #10135 from Kelenius/ofBorgsAndShakers 
Of borgs and shakers
 2015-07-23 21:41:48 +03: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
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
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
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
PsiOmegaDelta
cac095e53a Merge pull request #10237 from mwerezak/throw-mode 
Fixes #10230
 2015-07-19 10:55:56 +02: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