cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,691 Commits 9 Branches 0 Tags
037a901b2283018942f425e7347669597d571c4d
Commit Graph

11696 Commits

Author SHA1 Message Date
PsiOmega
e5d8b15d01 Compilation fixes. 2015-06-26 20:33:55 +02:00
PsiOmega
f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
 2015-06-26 20:28:47 +02:00
PsiOmega
6c891406f9 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/update_icons.dm
	code/setup.dm
 2015-06-26 19:22:31 +02:00
PsiOmegaDelta
8fef02501c Merge pull request #9936 from mwerezak/fire 
Balances fire to work better with very low concentration phoron gas burning
 2015-06-26 13:34:21 +02:00
Chinsky
ed779b7ff9 Merge pull request #9937 from mwerezak/master-fixes 
Fixes
 2015-06-26 09:19:48 +03:00
mwerezak
c6c200c127 Fixes #9251 2015-06-26 01:38:04 -04:00
mwerezak
1b978f9570 Makes update_inv_head() respect item_state and item_icons 
Fixes #9873
 2015-06-26 01:34:15 -04:00
mwerezak
aae29d8b6e Adds 'melting' and ignition points for various materials 2015-06-26 00:41:19 -04:00
mwerezak
56065022a7 Updates fire_act() implementations to work better with lower temperature fires 
In some cases fire_act() wasn't even checking the applied temperature. Reworks how fire damages flooring.
 2015-06-26 00:40:55 -04:00
mwerezak
9d7a1b9ad6 Fixes misleading path and proc name 2015-06-26 00:40:31 -04:00
GinjaNinja32
5906ae7556 Adds 'age' command to world.Topic, for the IRC bot. Also runs all keys through ckey() before using them, to avoid easily-fixed errors 2015-06-25 22:52:36 +01:00
Chinsky
78784a3d9a Fixes #9933 
Also potential same issue with other scalpel subtypes.
 2015-06-25 23:59:12 +03:00
Chinsky
265b1d5b51 Fixes #9913 
Also axes hidden var in lieu of using implants like other foreign objects. Now instead of one object, amount of stuff you can put in someone's organ is restricted by stuff's combined w_class.
 2015-06-25 23:51:58 +03:00
Chinsky
9d03286b6c Added yet another special snowflake check for assistants so they'd get properly dressed on preview icon. 2015-06-25 23:04:33 +03:00
Chinsky
e6b4cecf50 Fixes #9519 
Now client can't escape the resetting!
 2015-06-25 21:09:51 +03:00
Zuhayr
27a7768ffc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-06-25 17:58:37 +09:30
GinjaNinja32
d722dfa420 Merge pull request #9911 from mwerezak/disposal 
Disposals fixes
 2015-06-25 06:14:00 +01:00
mwerezak
51eecd54f0 Fixes disposal bins filling instantly 
Fixes disposal bins filling instantly, side effect of fixing
air_contents having the wrong volume
 2015-06-24 22:09:47 -04:00
mwerezak
cb0b3a30da Fixes runtime 
Fixes the other runtime in #9310
 2015-06-24 00:13:41 -04:00
mwerezak
a147a4e15e Removes fat mutation checks 2015-06-23 23:36:19 -04:00
mwerezak
285ce84044 Fixes disposals not transferring gas to holder, creating air_contents with the wrong volume, runtime due to terrible management of shared gas_mix 
Fixes one of the runtimes in #9310
 2015-06-23 23:32:27 -04:00
Zuhayr
130ff67414 Merge pull request #9902 from Baystation12/dev-freeze 
Dev freeze
 2015-06-23 20:53:38 +09:30
Chinsky
8bb0f7496e Merge pull request #9900 from mwerezak/extinguisher 
Changelog, fire patting
 2015-06-23 06:46:34 +03:00
mwerezak
4961efec0f Adjusts patting to account for shorter timeout 2015-06-22 22:17:30 -04:00
PsiOmegaDelta
9698def0e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/nano/modules/human_appearance.dm
 2015-06-22 16:59:19 +02:00
GinjaNinja32
9c32851ba5 Merge pull request #9871 from mwerezak/extinguisher 
Fire Extinguishers
 2015-06-22 15:36:55 +01:00
Zuhayr
aa2e25928d Fixes a runtime with organ Destroy() called with nonhuman owner. 2015-06-22 22:03:24 +09:30
PsiOmega
60f6a2ea10 Fixes antags being able to see the appearance changer. 
Sets invisibility level to MAXIMUM.
 2015-06-21 21:12:28 +02:00
GinjaNinja32
4b5899fa30 Merge pull request #9880 from PsiOmegaDelta/150621-MeteorExAct 
Corrects two ex_acts.
 2015-06-21 13:16:23 +01:00
GinjaNinja32
e3cf4692b5 Merge pull request #9879 from PsiOmegaDelta/150621-BoldChanges 
Fixes the Changelog menu button.
 2015-06-21 13:16:18 +01:00
PsiOmegaDelta
1a6ea56194 Fixes the Changelog menu button. 
It had lost the ability to go bold upon detected unread changelog entries.
 2015-06-21 13:39:26 +02:00
PsiOmegaDelta
8100f286a6 Corrects two ex_acts. 
Decreases immovable rod severity to match other ex_acts in file.
Increases meteor gun ex_act severity.
 2015-06-21 13:26:48 +02:00
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
GinjaNinja32
7f319f528a Merge pull request #9875 from Zuhayr/dev-freeze 
Antag system fixes
 2015-06-21 12:07:50 +01:00
Zuhayr
d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
PsiOmegaDelta
3d572ccc27 Merge pull request #9874 from mwerezak/fixes 
Dev-freeze Fixes
 2015-06-21 09:04:08 +02:00
PsiOmegaDelta
9426d0844c Merge pull request #9872 from mwerezak/earslot 
Fixes #9514
 2015-06-21 09:03:00 +02:00
mwerezak
80c80abe3a Fixes #9511 2015-06-21 03:00:37 -04:00
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
mwerezak
a4fb9fbb51 Patting out flames is no longer extremely effective 2015-06-21 00:44:14 -04:00
mwerezak
6a8aeb0153 Makes fire extinguishers effective at putting out mob fires 
Doubles the amount of water extinguishers carry and quadruples the
amount of water sprayed with each use. Halves the damage taken by slimes
when exposed to water to compensate.

Also refactors chair propelling a bit.
 2015-06-21 00:43:15 -04:00
Zuhayr
7473d18ecb Merge pull request #9795 from hockeygoalie5/iaasuit 
Internal Affairs Hardsuit (and a new pen!)
 2015-06-21 13:24:13 +09:30
PsiOmegaDelta
405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm
 2015-06-20 20:40:06 +02:00
Mustafa Kalash
ac032f70fc Changes the module from a watch to the horrible tie. Renames module to augmented tie. Moves module to the ERT ready room. 2015-06-20 14:26:37 -04:00
PsiOmegaDelta
4a5da7221c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/resist.dm
 2015-06-20 20:24:05 +02:00
Mustafa Kalash
bb370a66f3 Merge remote-tracking branch 'upstream/dev' into iaasuit 2015-06-20 14:07:44 -04:00
PsiOmegaDelta
33dc2e5811 Merge pull request #9867 from Zuhayr/dev-freeze 
More fixes
 2015-06-20 19:05:32 +02:00
GinjaNinja32
82aa88c777 Merge pull request #9862 from Zuhayr/dev 
Fixes
 2015-06-20 17:27:26 +01:00
Zuhayr
6fff0069db Fixes # #8327 2015-06-21 01:48:15 +09:30