cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,196 Commits 5 Branches 0 Tags
d7650f55ea65bc3b3b89b51f564749faee530e23
Commit Graph

5749 Commits

Author SHA1 Message Date
PsiOmega
da6a3e98d8 Fixes a borg spawn runtime. 
Adds client check to prevent null.statpanel runtime.
 2015-08-12 08:04:11 +02:00
PsiOmegaDelta
163ac0de1e Merge pull request #10521 from GinjaNinja32/mirror_gender 
Mirrors no longer check the user's gender when finding the list of valid hairstyles
 2015-08-12 06:26:45 +02:00
GinjaNinja32
41965d93ef Mirrors no longer check the user's gender when finding the list of valid hairstyles 2015-08-12 01:00:43 +01:00
PsiOmega
e4f6436a85 Fixes #10494. 
Borgs have their very own custom little headset, so cute.
 2015-08-11 21:11:16 +02:00
Chinsky
7b1656f40c Merge pull request #10470 from Karolis2011/dev-freeze 
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
 2015-08-11 20:07:06 +03:00
Zuhayr
20e7ee0b71 Merge pull request #10111 from mwerezak/eye-attack 
Makes grab eye attacking respect species lore better
 2015-08-12 02:36:50 +09:30
PsiOmega
78ffb5835a Misc. 2015-08-11 17:33:03 +02:00
SomeoneElse
8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
PsiOmegaDelta
54162f1c7d Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes 2015-08-11 12:20:54 +02:00
mwerezak
c98b6a1d97 Merge pull request #10457 from Zuhayr/dev-freeze 
Custom item rolldown.
 2015-08-09 10:33:54 -04:00
PsiOmega
889f399356 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/area/areas.dm
	code/game/machinery/alarm.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2015-08-09 13:15:22 +02:00
PsiOmegaDelta
31b8335298 Merge pull request #10456 from mwerezak/air-alarm 
Fixes
 2015-08-09 10:09:02 +02:00
Zuhayr
aed2ac3dfe Moved custom_synthetic.dmi into a proper define. 2015-08-09 16:48:20 +09:30
mwerezak
b1b3b4899b Fixes #7928 
Uses camera/set_status() to ensure viewers are kicked and camera cache updated.
 2015-08-09 00:24:18 -04:00
PsiOmegaDelta
22c500ed2b Merge pull request #10452 from mwerezak/stump-fix 
Backports #10331
 2015-08-08 19:16:25 +02:00
mwerezak
1e3d3101de Fixes #9966 2015-08-08 11:28:22 -04:00
Kearel
4139a51946 Initial fixes 
Changes interaction between stumps and items.

Conflicts:
	code/modules/organs/organ_stump.dm
 2015-08-08 11:10:28 -04:00
PsiOmegaDelta
c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix 
Material stack related fixes
 2015-08-08 09:56:25 +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
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
Kelenius
e935baf1d8 Fixes #10418 - bots don't remover from stuns 2015-08-04 12:41:32 +03: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
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
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
mwerezak
47d30a49a0 Fixes #10389 
Allows glasses to set the see_invisible of their wearer.
 2015-07-31 01:33:43 -04:00
Mloc
8cf9e32c2e Merge pull request #10361 from atlantiscze/tiny-little-logspammers 
Fixes #10356
 2015-07-30 19:24:24 +01: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
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
Zuhayr
c5c7dddf63 Merge pull request #9979 from mwerezak/camera-console-fix 
More check_eye() fixes
 2015-07-27 17:56:03 +09:30
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
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