cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,625 Commits 10 Branches 0 Tags
07874b9ca8b2a0a7c47540cf5ca49558eb32e204
Commit Graph

21406 Commits

Author SHA1 Message Date
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
mwerezak
8398fce523 Merge pull request #11303 from PsiOmegaDelta/151015-SurgicalPackaging 
Surgical kits can now contain their equipment.
 2015-10-15 05:51:29 -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
PsiOmegaDelta
b891ef9754 Ensures the nuclear disc always spawns on the station. 
Also make sure the pick_area_turf() call doesn't runtime due to the predicate list not being a list.
 2015-10-15 11:01:47 +02:00
PsiOmegaDelta
e79e82f55d Gives replacement light boxes the same fitness treatment. 2015-10-15 10:42:51 +02:00
PsiOmegaDelta
fd03e4d59b Surgical kits can now contain their equipment. 
The surgical kit can now contain the equipment it came with. It can also not contain more items of a given type than it was spawned with.
This means that even if the storage container otherwise has sufficient space it can, for example, still only ever contain 1 surgical saw.

Fixes #11298. Fixes #11297.
 2015-10-15 10:20:49 +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
HarpyEagle
ffb26a6f87 Adds checks for antags being dead or SSD 2015-10-14 14:57:52 -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
mwerezak
21fada644d Merge pull request #11290 from PsiOmegaDelta/151013-LawLogging 
Fixes law change logging.
 2015-10-14 10:46:30 -04:00
PsiOmegaDelta
e41131368b Compilation fixes. 2015-10-14 08:43:38 +02: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
mwerezak
f245e41db2 Merge pull request #11287 from PsiOmegaDelta/151013-TopicFingerprints 
Changes how Topic() calls apply fingerprints.
 2015-10-13 22:11:26 -04: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
a19829e968 Merge pull request #11289 from Kearel/secRemoveMaster 
Pointed secret changes to master
 2015-10-13 20:27:56 +02: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
Kearel
78956843a8 Pointed secret changes to master 
New gamemodes on dev will still need to be changed.
 2015-10-13 12:30:52 -05: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
GinjaNinja32
c6f328159c Merge pull request #11286 from PsiOmegaDelta/151013-SillyMistake 
Antag spawner now uses the starting location list...
 2015-10-13 08:04:21 +01:00
PsiOmegaDelta
cfc01d053b Changes how Topic() calls apply fingerprints. 
Now applies fingerprints if the user is adjacent to a physical object, otherwise applies a hidden fingerprint.
CouldUseTopic() is only called when a user has successfully interacted with an object interface/UI.
 2015-10-13 08:56:20 +02:00
PsiOmegaDelta
f0244bc9e5 Antag spawner now uses the starting location list... 
..instead of the mob. Someone (might just maybe potentially be me, who knows) cleaned up the code a bit too quickly. Fixes #11284.
 2015-10-13 08:09:12 +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
c0dc32d60c If an antag could not be auto-spawned, the game rechecks in the minimum time. 2015-10-12 13:03:51 -04:00
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
Hubblenaut
1c8ec1a700 Fixes stack creation logic and return value 2015-10-11 22:02:05 +02:00
HarpyEagle
e381e2faf2 Fixes do_not_announce parameters not actually doing anything 2015-10-11 12:18:01 -04:00
HarpyEagle
c7afded12d Cleans up calamity shuffle, makes sure antag types are selected in a random order for other game modes. 2015-10-11 12:18:01 -04:00
HarpyEagle
d715e0645f Removes unused latejoin template list 2015-10-11 12:02:04 -04:00
HarpyEagle
43d5f2e3bd Ensures leftover candidates and pending antags are cleared after finalizing 2015-10-11 11:39:26 -04:00
PsiOmegaDelta
27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
 2015-10-11 17:37:01 +02:00
PsiOmegaDelta
38c6ba3a07 Code relocation. 2015-10-11 17:31:21 +02:00
HarpyEagle
dec0629fae Renames latespawn() to be less confusing 2015-10-11 11:26:24 -04:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
Neerti
7571ba8c4b Think I'm done. 2015-10-11 01:16:25 -04:00
SinTwo
ec58f7c705 TG_Port 
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/clothing/under/accessories/accessory.dm
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/mask.dmi
	icons/obj/clothing/hats.dmi
	polaris.dme
 2015-10-11 00:58:26 -04:00