cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,040 Commits 10 Branches 0 Tags
3fd172ee63611dd7aff27475f016df40c6682225
Commit Graph

20336 Commits

Author SHA1 Message Date
PsiOmegaDelta
3fd172ee63 Merge pull request #11294 from Baystation12/master 
Dev-freeze
 2015-10-14 08:40:03 +02:00
PsiOmegaDelta
a19829e968 Merge pull request #11289 from Kearel/secRemoveMaster 
Pointed secret changes to master
 2015-10-13 20:27:56 +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
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
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
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
PsiOmegaDelta
38c6ba3a07 Code relocation. 2015-10-11 17:31:21 +02: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
Chinsky
debe69aa80 Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer 
Fixes #11263.
 2015-10-10 17:51:15 +03:00
Hubblenaut
d3572bf4cb Fixes empty flavor text drawing two spaces 2015-10-10 15:55:25 +02:00
PsiOmegaDelta
fd3370c01f Fixes #11263. 
Now possible to use items other than emags on holodeck computers
Blobs no longer make computers lose their density state.
Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless).
Fixes #11263.
 2015-10-10 10:11:48 +02:00
GinjaNinja32
d5928d9927 Merge pull request #11260 from mwerezak/ttv 
Fixes TTV Yield
 2015-10-10 09:05:00 +01:00
HarpyEagle
fa86509daf Readds organ damage from failing to mend ribs 2015-10-09 18:57:17 -04:00
HarpyEagle
5684befee2 Fixes #11262 2015-10-09 18:57:17 -04:00
Hubblenaut
80cc83dbf8 Fixes backup power test light 2015-10-09 17:44:30 +02:00
HarpyEagle
6c3bbb9ee8 Updates changelog, fixes comment 2015-10-09 11:39:22 -04:00
HarpyEagle
63838b01d4 Updates preset TTV bombs, adds debug verb 2015-10-09 11:18:12 -04:00
PsiOmegaDelta
e237e33030 Merge pull request #11259 from mwerezak/rubber-bullets 
Rubber bullets and beanbags now check melee armour instead of bullet armour
 2015-10-09 12:42:44 +02:00
HarpyEagle
1cf6ace74e Fixes #11071, #10936 
Adjusts fire_fuel_energy_release to compensate for fixed fire heat release.
Adjusts liquid fire burn parameters so that liquid fuel fire heat release and
burn duration is unaffected.
 2015-10-09 01:19:15 -04:00
HarpyEagle
9639d608a6 Fixes calculate_firelevel() not counting oxidizer 
Fixes calculate_firelevel() not counting oxidizer when determining the ratio
of reactants to other gases. As well firelevel calculation is now done
separately for burning gas and burning liquid.

Adjusted FIRE_LIQUID_BURNRATE_MULT so that liquid burn rate is unaffected by
this fix, which will result in generally higher firelevels and thus faster
burn rates.
 2015-10-08 23:40:08 -04:00
HarpyEagle
fa661f998f TTV Refactor 
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.
 2015-10-08 23:26:05 -04:00
HarpyEagle
40ab99b354 Rubber bullets and beanbags now check melee armour instead of bullet armour 2015-10-08 16:36:51 -04:00
PsiOmegaDelta
bd7c475fcc Stack material use now depends on charge costs. 
This ensures one does not have to remember to set uses_charge equal to the length of the charge_cost list. Fixes #10943.
 2015-10-08 20:29:39 +02:00
PsiOmegaDelta
c5d8fbfd57 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/modules/mob/living/living_defense.dm
 2015-10-07 08:07:23 +02:00
Chinsky
f47a58e23e Merge pull request #11244 from Kelenius/hackMe 
Basic encryption hack popup only shows suitable APCs
 2015-10-06 20:29:51 +03:00
Chinsky
8107786cbd Merge pull request #11245 from PsiOmegaDelta/151005-RobustRoboticsSpeech 
Makes silicon language handling more robust.
 2015-10-06 19:32:54 +03:00
Chinsky
c7070dd7f7 Merge pull request #11251 from PsiOmegaDelta/151006-JobReport 
Antagonist summary printout now prefers assignment over special role.
 2015-10-06 19:26:42 +03:00
PsiOmegaDelta
ec097d928a Antagonist summary printout now prefers assignment over special role. 
As antags are listed under relevant headings, i.e. "The traitors were", this seems more reasonable. Fixes #10817.
 2015-10-06 09:19:40 +02:00
HarpyEagle
74950268d7 Fixes fire_stacks update logic 2015-10-05 19:24:33 -04:00
PsiOmegaDelta
bbcadcc080 Makes silicon language handling more robust. 
Also fixes an issue with lists being targets for qdel(). Fixes #11221.
 2015-10-05 11:21:09 +02:00
Kelenius
f3effa8df7 Basic encryption hack popup only shows suitable APCs 2015-10-05 11:40:19 +03:00
PsiOmegaDelta
91faf8555f Antag placement now favors mobless turfs. 
If one such turf is available, otherwise picks a random populated turf. Fixes #11237.
 2015-10-05 10:13:05 +02:00
PsiOmegaDelta
f4be4c0ad9 Merge pull request #11238 from Baystation12/master 
Dev-freeze
 2015-10-04 17:31:44 +02:00
GinjaNinja32
5ef5f40cbe add 'info' topic command to get information on a character 2015-10-02 12:45:19 +01:00
mwerezak
4dc7ff8e9c Merge pull request #11223 from GinjaNinja32/11222 
fix #11222
 2015-09-30 13:43:47 -04:00
GinjaNinja32
11141462a0 fix #11222 
also fixes the name and adds feedback to adding items
 2015-09-30 00:00:36 +01:00
PsiOmegaDelta
86223d65bf TODO done. 2015-09-29 11:28:31 +02:00
PsiOmegaDelta
597631687b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-29 11:26:42 +02:00
PsiOmegaDelta
d77bcd7937 The silicon law manager now only requires the host to be conscious. 
This should mean that the law manager is available even for carded AIs, even with the wireless interface disabled. Fixes #11139.
 2015-09-28 21:23:10 +02:00
PsiOmega
807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
 2015-09-27 13:36:56 +02:00
Chinsky
c3d6fd07fd Merge pull request #11199 from mwerezak/paper-gender 
Fixes #11196
 2015-09-27 13:02:59 +03:00
Chinsky
7ad55e0197 Merge pull request #11200 from mwerezak/sojourner 
Fixes #11130
 2015-09-27 13:02:50 +03:00
HarpyEagle
380b89fcc0 Fixes #11130, renames aghosted var 
because it is no longer used solely for aghosting.
 2015-09-26 20:48:13 -05:00
HarpyEagle
592c824837 Changes paper and paper bundle gender, plus rename 2015-09-26 20:27:57 -05:00
Hubblenaut
f0481b551e Fixes grab-buckling overwriting pixelshift 2015-09-26 14:11:01 +02:00