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
28,625 Commits 5 Branches 0 Tags
07874b9ca8b2a0a7c47540cf5ca49558eb32e204
Commit Graph

13038 Commits

Author SHA1 Message Date
PsiOmegaDelta
e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
 2015-10-25 20:28:48 +01:00
PsiOmegaDelta
a3027febee Merge pull request #11373 from Baystation12/master 
Dev-freeze.
 2015-10-25 20:00:44 +01:00
PsiOmegaDelta
7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2 
Refactors item attack click and mob melee attack handling code
 2015-10-25 08:43:47 +01:00
Chinsky
28637334d4 Merge pull request #11329 from PsiOmegaDelta/151018-FlashRestoration 
Relocates synth flash recharge code.
 2015-10-24 18:59:02 +03:00
PsiOmegaDelta
d845a2f587 Generalizes the feed and force feed checks. 2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14 Can no longer use utensils to eat if you lack the means. 
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes  #11333.
 2015-10-22 16:52:07 +02:00
PsiOmegaDelta
0b9b8feb1e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
 2015-10-21 10:38:57 +02:00
PsiOmegaDelta
db833735a8 Merge pull request #11340 from Baystation12/master 
Dev-freeze.
 2015-10-21 10:36:30 +02:00
Chinsky
18ae968bda Merge pull request #11337 from PsiOmegaDelta/151020-Mmm_hydrogen 
Fixes #11334.
 2015-10-21 01:56:16 +03:00
Chinsky
e5cda9ad60 Merge pull request #11332 from PsiOmegaDelta/151019-BloodUponBlood 
Limits the number of runes to one per turf.
 2015-10-21 01:56:08 +03:00
PsiOmegaDelta
4c96cd62a7 Condiments now check for proximity before continuing with the rest of afterattack. Fixes #11334. 2015-10-20 17:11:55 +02:00
PsiOmegaDelta
55f6c1c0b5 Merge pull request #11204 from Hubblenaut/medical 
Bruise Packs, Changes and small Fixes
 2015-10-19 16:17:16 +02:00
PsiOmegaDelta
b92be265ee Limits the number of runes to one per turf. 
Fixes #11248.
 2015-10-19 12:49:32 +02:00
PsiOmegaDelta
a60103982b Merge pull request #11311 from Ccomp5950/stop_stop_hes_already_dead 
Dead people feel no pain.
 2015-10-19 07:08:25 +02:00
PsiOmegaDelta
64176f1c4e Relocates synth flash recharge code. 
Moves the flash recharge from security modules to all of them. Fixes #11322.
 2015-10-18 17:55:56 +02:00
PsiOmegaDelta
e116721977 Character setup refactoring. 
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.
 2015-10-18 17:34:35 +02:00
ccomp5950
9aea0cecc7 Dead people feel no pain. 
Resolves #10797
 2015-10-18 01:27:24 -04:00
HarpyEagle
ffc50c3cfa Fixes #11321 2015-10-17 20:53:03 -04:00
Cael Aislinn
105792686a resprites xenoarch items (guns, eguns and other small stuff) and some large artifacts by skowron, reworks preset triggers to be a little more predictable for specific large artifact groups 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-10-17 02:02:55 +10:00
Hubblenaut
cbd0972bfa Bruise packs are used per wound and take time to apply 2015-10-16 16:36:04 +02:00
Atlantis
a70ec21e64 Fixes #11276 
- Re-adjusts two values to take new lighting in account.
- For reference. Turf which has light fixture (large) on it, has light value of 6. An average half-lit turf has around 1.5. These values were obtained via in-game tests.
- Using old values, diona would die (without another light source such as flashlight) when standing on any other turf other than turf with light fixture.
- Now it should be relatively similar to the old values before lighting changes.
 2015-10-16 14:17:47 +02:00
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
 2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
 2015-10-16 11:04:43 +02:00
ccomp5950
111973ed5c AI's can now use languages through holopads... 
...and have it respect if the listener understands.

Resolves #11113 (AI's speech not timestamped through holopad)
Resolves #11183 (All languages can be understood when AI speaks them through a holopad.)
Resolves #6217  (pAIs cannot hear AI hologram speech)
 2015-10-15 19:56:45 -04:00
Chinsky
0c474bc5a5 Merge pull request #11281 from mwerezak/autoantag 
Cleans up antag auto-spawning, adds checks for active antags
 2015-10-15 19:16:13 +03:00
Chinsky
2a88b4d0aa Merge pull request #11219 from PsiOmegaDelta/150929-HumanoidVision 
Overhauls humanoid vision handling.
 2015-10-15 19:15:28 +03:00
Snapshot
d75a146cc3 Merge pull request #11306 from mwerezak/sunglasses-loadout 
Fixes #11216
 2015-10-15 07:47:21 -07:00
mwerezak
07881e7495 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2 
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
 2015-10-15 07:08:16 -04:00
HarpyEagle
e24313be2e Fix macro 2015-10-15 07:02:57 -04:00
mwerezak
7272deb5ae Fixes #11216 
Sunglass-derived custom gear is now only available to roles that normally have access to them.
 2015-10-15 06:58:25 -04:00
mwerezak
27fe99bdf0 Reagent transfer now checks simulated var 2015-10-15 06:46:07 -04:00
mwerezak
41e8798516 Adjusts chemsmoke breathing 
Inhaled reagents are now split between bloodstream and ingestion.
Reagents are not inhaled if environment pressure is too low.
 2015-10-15 06:45:22 -04:00
mwerezak
d260b3bb18 Fixes #11300 
Atoms crossing a smoke cloud now get splashed with up to 10 units of reagent.
 2015-10-15 06:44:21 -04:00
mwerezak
dcde34512c Refactors pepperspray touch effect, adjusts pepperspray messages. 2015-10-15 06:42:08 -04:00
PsiOmegaDelta
2fcaaf80c7 Chemistry machinery fixes. 
Makes Topic() calls check parent. Adds proper operable() checks where applicable.
Makes the interact_offline only affect the NOPOWER flag.
Fixes #11116. Fixes #11302.
 2015-10-15 11:31:57 +02:00
mwerezak
27429f7b0c Less copypasta 2015-10-15 01:59:04 -04:00
Datraen
39d384cbe4 Makes Deckard's gun usable. 2015-10-14 19:05:14 -04:00
Mike
4db9677c88 Fixes pepperspray confusion 
Eye protection now prevents blindness, face protection prevents stun, instead of face protection doing both.
 2015-10-14 14:49:52 -04:00
PsiOmegaDelta
3fd28dd361 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-10-14 08:41:38 +02:00
PsiOmegaDelta
3fd172ee63 Merge pull request #11294 from Baystation12/master 
Dev-freeze
 2015-10-14 08:40:03 +02:00
Chinsky
8c8b5a34d3 Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob 
Blob spawn locations are now more random
 2015-10-14 03:24:28 +03:00
PsiOmegaDelta
d7b6784e28 Fixes law change logging. 
The "Show last X law changes" review window should now actually be useful, displaying AI law updates with time, user, and law change.
 2015-10-13 19:44:49 +02:00
PsiOmegaDelta
3b5990121f Blobs locations are now more random. 
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.

Space vines and nuclear discs have been updated to use the same mechanics.
 2015-10-13 18:49:55 +02:00
Zuhayr
608c766db2 Merge pull request #11279 from PsiOmegaDelta/151012-Ghostize 
ghostize() now attempts to set the most relevant time of death.
 2015-10-13 08:36:28 +10:30
Zuhayr
5dc6ff5da1 Merge pull request #11230 from PsiOmegaDelta/xenomorphs 
Xenomorph update
 2015-10-13 08:31:27 +10:30
HarpyEagle
241520f0bb Cleans up autospawn, now uses existing code for selecting and choosing 
candidates. Adds more debug messages, and removes unused code.
 2015-10-12 13:03:50 -04:00
mwerezak
46f5bbc1d4 Merge pull request #11277 from Hubblenaut/stacks 
Fixes stack creation logic and return value
 2015-10-12 11:25:51 -04:00
Kelenius
741cb2d423 It was bork, I made it not bork 2015-10-12 13:57:47 +03:00
PsiOmegaDelta
7247906f41 ghostize() now attempts to set the most relevant time of death. 
ghostize() now only uses the mob's time of death if the mob is actually dead, otherwise uses the current time. Fixes #11229.
 2015-10-12 12:55:34 +02:00
GinjaNinja32
de68e366f5 Merge pull request #11270 from Hubblenaut/master 
Flavor Text Bugfix
 2015-10-11 23:55:10 +01:00