cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,877 Commits 8 Branches 0 Tags
fd007cdea0e38953a2ba9b9bc2bf903b51cf63db
Commit Graph

20230 Commits

Author SHA1 Message Date
HarpyEagle
924d8fac74 Adds nightvision to cult constructs 2015-07-31 16:33:07 -04:00
mwerezak
b0434d90b2 Adds stealth rig sprites 
Adds sprites for the stealth rig, so that people don't mix it up with
the ninja. Helmet is different (based on swat mask and NVGs), everything
else is a copy of the ninja suit.
 2015-07-31 14:41:32 -04:00
mwerezak
1bfa4da870 Fixes #10315 
The cybersuit is no longer space-proof. In exchange, it has a few more
modules, built-in insulated gloves, and grippy shoes.
 2015-07-31 14:41:31 -04:00
Zuhayr
82152daa30 Merge pull request #10393 from Baystation12/dev-freeze 
Dev freeze
 2015-07-31 18:59:03 +09:30
PsiOmegaDelta
75920431e8 Merge pull request #10386 from mwerezak/antag-fix 
Fixes #10309
 2015-07-31 10:26:14 +02:00
PsiOmegaDelta
7e6cb6f38c Compilation/definition fixes. 2015-07-31 10:05:42 +02:00
PsiOmegaDelta
353f685339 Moves code to relevant define. 2015-07-31 10:00:34 +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
PsiOmegaDelta
3c9dc10746 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/gamemodes/cult/runes.dm
 2015-07-31 09:48:15 +02:00
mwerezak
47d30a49a0 Fixes #10389 
Allows glasses to set the see_invisible of their wearer.
 2015-07-31 01:33:43 -04:00
HarpyEagle
7feaf13d81 Fixes #10309 
Antag types with ANTAG_OVERRIDE_JOB are finalized before jobs are handed out, based on the idea that something which replaces a player's job should not need to depend on their assigned job in any way.
Moves the selection of pending antags outside of can_start().
Fixes issue with antag distribution that occurs when a player is a candidate for multiple antagonist types.
 2015-07-30 22:28:17 -04:00
Mloc
8578c08236 fixes #10374 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 22:46:54 +01:00
Mloc
b727de8398 anchored and unsimulated objects are no longer considered for airflow 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 21:00:42 +01:00
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
64e5b6e50a Merge pull request #10343 from GinjaNinja32/communicate-logging 
Adds a log_and_message_admins call to cult communication rune
 2015-07-30 19:25:05 +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
de3c24c29f Code relocation. 2015-07-30 10:58:03 +02: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
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
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
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
Chinsky
e037ee3fca Merge pull request #10345 from PsiOmegaDelta/150728-CrewMonitorRuntime 
Fixes crew monitor runtime and removes dead code.
 2015-07-29 14:25:43 +03:00
Kelenius
9eacd42de8 Sleeper-related fixes 2015-07-29 13:21:29 +03:00
PsiOmegaDelta
f49d8d5e54 Merge pull request #10352 from Baystation12/dev-freeze 
Dev freeze
 2015-07-29 12:16:23 +02: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