cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,819 Commits 8 Branches 0 Tags
cfac670cb68dfb383886caf40259be9061009f30
Commit Graph

19457 Commits

Author SHA1 Message Date
Mloc
cfac670cb6 anchored and unsimulated objects are no longer considered for airflow 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 19:51:11 +01:00
Mloc
ac5774c81c some dview tweaks & fixes 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 19:50:32 +01:00
Zuhayr
ad63247749 Merge pull request #10382 from Mloc/freezyfixes 
fixes
 2015-07-31 03:55:34 +09:30
Mloc
2622801d69 Merge pull request #10342 from atlantiscze/radio-fix 
Radio fixes
 2015-07-30 19:25:24 +01:00
Mloc
8cf9e32c2e Merge pull request #10361 from atlantiscze/tiny-little-logspammers 
Fixes #10356
 2015-07-30 19:24:24 +01:00
Mloc
6ef93d6613 Merge pull request #10370 from mwerezak/wounds 
Fixes wound max_bleeding_stage oddness
 2015-07-30 19:24:13 +01:00
Mloc
ce11a6b516 Merge pull request #10379 from Karolis2011/dev-freeze 
Fix for invisible tagger pipes
 2015-07-30 19:23:33 +01:00
Mloc
4413356a63 fix some weirdness with wall damage overlays 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 19:17:23 +01:00
Mloc
3461b7fb5c minor antag distribution fix 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 19:17:17 +01:00
HarpyEagle
c29dd9063c More tweaks to cut wound stages. 
Enforced "blood soaked" clots where the clot stage was also a bleeding
stage, adjusted the thresholds for gaping_big and massive wounds to be
more even.
 2015-07-30 11:46:49 -04:00
Karolis2011
a38ac6c8b7 Fix for invisible tagger pipes 2015-07-30 12:37:10 +03:00
PsiOmegaDelta
841f7f6db2 Compilation fixes. 2015-07-30 10:41:01 +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
PsiOmegaDelta
6845ec0f69 Merge pull request #10376 from mwerezak/vox-mask 
Fixes #10363
 2015-07-30 09:47:12 +02:00
GinjaNinja32
0fdbde92ee Merge pull request #10373 from mwerezak/heist-cleanup 
Fixes #10368
 2015-07-30 07:43:57 +01:00
mwerezak
10df6b9403 Fixes #10363 2015-07-30 00:57:31 -04:00
mwerezak
4af4e38571 Fixes #10368 2015-07-29 22:48:11 -04:00
Atlantis
3bb88b327c Fixes #10353 
- Fixes icons not updating properly
- Also fixes a runtime.
 2015-07-29 23:16:27 +02:00
HarpyEagle
171991faf8 Attempts to prevent future max_bleeding_stage confusion 
max_bleeding_stage no longer switches itself around in New().
Instead, the value given refers directly to the index of the maximum
bleeding stage.

Should also make wound datums more friendly to initial(), if that's ever
needed.
 2015-07-29 16:53:31 -04:00
HarpyEagle
3d10955ccb Adds missing clot stages to gaping_big and massive cuts. 
Without the clot stages the jump between the next two stages was
abnormally large, and the values given for max_bleeding_stage did not make
much sense.
 2015-07-29 16:46:50 -04:00
HarpyEagle
d384150a48 Fixes wound max_bleeding_stage oddness 
The max_bleeding_stage given to /datum/wound/cut/flesh led to
"Doctor places a bandaid on Patient's flesh wound." Also fixed the
bleeding stage for stumps, so that "bloody stump" counts as a bleeding
stage.
 2015-07-29 16:40:09 -04:00
Atlantis
d143a35eca Fixes #10357 
- Adjusts layer defines.
- Screen Layer (UI) is now 22. That should mean i will be above all else. This also prevents laser fire from overlapping the UI.
- Obfuscation Layer (AI's "cameraless zones") is now 21. That makes it above laser fire effects, fixing #10357
 2015-07-29 20:56:01 +02:00
Atlantis
55e41b9afd Fixes #10356 
- Maintenance drone law reset no longer spam admin's logs.
 2015-07-29 20:19:31 +02:00
Zuhayr
3c28c36cff Merge pull request #10347 from GinjaNinja32/status 
Change Topic() 'status' command to make more sense
 2015-07-30 02:22:38 +09:30
Chinsky
b9d8cdaee1 Merge pull request #10337 from mwerezak/turret-aiming 
Fixes #10258
 2015-07-29 16:18:42 +03:00
Mloc
2b13741582 Merge pull request #10348 from GinjaNinja32/logs 
Chemical logging improvements
 2015-07-29 13:39:26 +01:00
Chinsky
e17b8be47e Merge pull request #10344 from GinjaNinja32/cult-gender 
His book? Her book.
 2015-07-29 14:37:16 +03:00
GinjaNinja32
7a6599fdf4 Add logging to potassium-water and nitroglycerin reactions 2015-07-29 12:36:00 +01:00
PsiOmega
0e8ca3c82c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/player_notes.dm
 2015-07-29 11:57:17 +02:00
Atlantis
07daa25de9 Updates telecommunications presets 
- Changes some hardcoded frequency numbers i used to use proper constants.
- Fixes non-common channels not working due to signal not getting to the server.
 2015-07-29 11:17:42 +02:00
GinjaNinja32
84c7625490 Chemical logging improvements 2015-07-29 07:55:30 +01:00
GinjaNinja32
2cf4f6e4db Change Topic() 'status' command to make more sense 2015-07-29 06:39:03 +01: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
Chinsky
0a54797044 Merge pull request #10341 from GinjaNinja32/notes-format 
Changes show_player_info_irc to properly escape '%'
 2015-07-28 14:02:08 +03:00
Atlantis
2fb1d74444 Telecommunications adjustment 
- This commit attempts to resolve #7294
- Common and AI Private channels are now separate from other non-department frequencies. I hope this will reduce load on Common server, therefore mitigating the overload? problems that may cause duplication of messages.
- Another server has been added, which handles all non-department non-common frequencies. This server is likely to be under minimal load so i hope the duplication bug shouldn't happen again.
- Unmaps one broadcaster and receiver from telecomms in another attempt to remove duplication
 2015-07-28 12:34:57 +02:00
GinjaNinja32
09a8f37d6c Changes show_player_info_irc to properly escape '%' 2015-07-28 10:59:51 +01:00
Atlantis
e10a1f3e01 Mercenaries/Raiders should now have proper headset again 
- This should fix #10313
 2015-07-28 10:48:22 +02:00
PsiOmegaDelta
c0d23536e2 Merge pull request #10338 from PsiOmegaDelta/dev-freeze 
Master -> Dev-freeze
 2015-07-28 08:55:01 +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
Mloc
aab326e05f fixes #10232 
makes lights trigger on forceMove using a vg change

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-27 11:40:37 +01:00
GinjaNinja32
40693fda5b Merge pull request #10335 from PsiOmegaDelta/150727-SpawnLog 
Adds admin message log to the spawn verb.
 2015-07-27 10:54:40 +01:00
Mloc
1d8e015334 fixes #10141 
also clean up alloy_data handling

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-27 10:49:51 +01:00
PsiOmegaDelta
81c40c14b1 Compacts down the game panel spawn logging and makes it always notify admins. 2015-07-27 11:47:55 +02:00
PsiOmegaDelta
631c30732d Adds admin message log to the spawn verb. 
The spawn-verb no longer only makes an entry in the admin log but also messages admins, making it less sneaky.
 2015-07-27 11:24:44 +02:00
Mloc
65ad30f27c Merge pull request #10305 from GinjaNinja32/player-panel 
Changes player panel to always display key if present
 2015-07-27 10:20:11 +01:00
Mloc
2046bd1cec Merge pull request #10330 from mwerezak/fire 
Fixes oversight in fire burnout check
 2015-07-27 10:19:50 +01: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