cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,229 Commits 8 Branches 0 Tags
cc19bbb604a1ff0d84f44eb18f24ccac05ca443a
Commit Graph

18252 Commits

Author SHA1 Message Date
Zuhayr
cc19bbb604 Merge pull request #8972 from DeeUnderscore/paper-functionality 
Paper functionality additions
 2015-04-29 02:46:21 +09:30
mwerezak
19aff88b90 Fixes #9017 2015-04-28 12:22:21 -04:00
Zuhayr
74db1f71b5 Merge pull request #9018 from Kelenius/ofChemAndTwo 
Chemistry recipes: absolute pathing
 2015-04-29 00:15:20 +09:30
Kelenius
185aadb5a9 Chemistry recipes: absolute pathing 2015-04-28 16:55:13 +03:00
Chinsky
04b994f939 Merge pull request #9008 from PsiOmegaDelta/CameraPoff 
Adds the APC & camera damage events.
 2015-04-28 13:49:50 +03:00
PsiOmega
86d2fa5f61 Build fixes. 2015-04-28 09:04:00 +02:00
PsiOmega
f760d44127 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm
 2015-04-28 08:43:31 +02:00
PsiOmegaDelta
bf43270624 Merge pull request #9015 from Kelenius/ofChemAndOne 
Chemistry update - part one
In spite of the sassy tone.
 2015-04-28 08:39:27 +02:00
Kelenius
d9e2947b32 Updates chemistry colors 2015-04-28 09:23:39 +03:00
PsiOmegaDelta
bb7cd10cbb Merge pull request #8984 from volas/master 
Fixes #8913
 2015-04-28 07:53:45 +02:00
PsiOmegaDelta
1e457f6e34 Merge pull request #9009 from Yoshax/icanintosurgery 
Fixes antag surgery kit
 2015-04-28 07:35:58 +02:00
Chinsky
0e1a8051f8 Merge pull request #8996 from PsiOmegaDelta/SecureBuzzing 
Now only secure airlocks buzz if access is restricted.
 2015-04-28 06:26:49 +03:00
Chinsky
6fb3446af3 Merge pull request #9000 from RavingManiac/master 
Candle tweak
 2015-04-28 06:26:44 +03:00
Chinsky
0ff3d9af99 Merge pull request #9005 from mwerezak/master-fixes 
Fixes (master)
 2015-04-28 06:26:32 +03:00
Chinsky
afa82e5d83 Merge pull request #9003 from mwerezak/dev-fixes 
Fixes
 2015-04-28 06:26:22 +03:00
Chinsky
1328414485 Merge pull request #8960 from mwerezak/item-color 
Fixes #8577, cleans up item_color, clothing/under and backpacks
 2015-04-28 06:25:35 +03:00
Chinsky
bf7dc5be9d Merge pull request #8994 from PsiOmegaDelta/AirlockPressure 
Airlocks can now crush more things.
 2015-04-28 06:25:23 +03:00
volas
59e17f7a9b small fix 2015-04-28 00:41:14 +03:00
mwerezak
36d9944dfd Fixes #8977 2015-04-27 14:55:18 -04:00
mwerezak
d0615430ec Fixes #8997 
Gibbing a human now causes all items on or in their person to get thrown around.
This includes implants and bullet shrapnel.
 2015-04-27 14:48:55 -04:00
PsiOmega
27e91b3fa0 Cameras now have a small chance of being permanently destroyed. 2015-04-27 19:09:46 +02:00
PsiOmega
541fff5ad2 Crushing closets or mechas will now cause damage to the door. 2015-04-27 19:02:38 +02:00
Daranz
8b792b6361 Merge branch 'dev' into paper-functionality 2015-04-27 12:37:31 -04:00
Yoshax
aa115f5bb2 Fixes antag surgery kit 2015-04-27 16:41:47 +01:00
PsiOmega
4bddde11ae Using cameranet cameras to avoid burning out things like ERT/mercenary helmet cameras and traitor spy cams. 2015-04-27 11:14:31 +02:00
PsiOmega
ed81d9fd63 Adds the ACP damage event. 2015-04-27 10:56:14 +02:00
PsiOmega
8626a83675 Adds the camera loss event. 2015-04-27 10:47:45 +02:00
PsiOmega
a78c559f6c Merge remote-tracking branch 'upstream/master' into dev 2015-04-27 08:08:39 +02:00
mwerezak
290a7d5000 Fixes #8536 
Also removes a bunch of redundant comments
 2015-04-27 01:11:40 -04:00
Kelenius
159ad76fab Fixes #8998 2015-04-27 08:06:21 +03:00
mwerezak
529a0e3fe9 Fixes #8992 2015-04-27 00:37:16 -04:00
mwerezak
c2751b0b12 Fixes #8823 2015-04-27 00:26:53 -04:00
RavingManiac
89a72fb326 Candle burn time increased to ~30 minutes 
Some fluff added to candle description explaining how they burn in space
 2015-04-27 12:10:54 +10:00
Zuhayr
1c627a94b9 Merge pull request #8991 from Kelenius/ofBotsAndMobs 
Updates bots to be mobs. Several changes.
 2015-04-27 11:29:32 +09:30
PsiOmega
f6d79d121c Now only secure airlocks buzz if access is restricted. 2015-04-26 22:05:39 +02:00
PsiOmega
d0397784c0 Mech sensors should not block airlocks. 2015-04-26 21:44:05 +02:00
PsiOmega
5c993e3a31 Removes the stop effect because I don't personally care one way or another. 2015-04-26 21:42:43 +02:00
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
PsiOmega
19a981e961 Airlocks can now crush more things. 
Airlocks can now crush mobs, canisters, closets, and mechas.
Fixes #8983.
 2015-04-26 19:29:13 +02:00
PsiOmegaDelta
967223364d Merge pull request #8988 from mwerezak/droplimb 
Adjusts threshold for limb removal due to damage
 2015-04-26 19:16:34 +02:00
Chinsky
e0c00bda55 Merge pull request #8973 from mwerezak/inventory2 
Inventory updates
 2015-04-26 20:13:21 +03:00
Chinsky
5f30d0fa9a Merge pull request #8982 from PsiOmegaDelta/Bullets 
Adds practice rounds.
 2015-04-26 20:06:37 +03:00
Chinsky
7359562e16 Merge pull request #8905 from PsiOmegaDelta/BorgModules 
Silicon Subsystem update.
 2015-04-26 20:06:21 +03:00
Chinsky
946373f8a0 Merge pull request #8975 from PsiOmegaDelta/Thunderdome 
Custom ambiance music for holodeck programs.
 2015-04-26 20:05:58 +03:00
Chinsky
75ffb05c5b Merge pull request #8981 from DeeUnderscore/cell-charger-fix 
Fix cell charger icon not updating when cell taken out by a borg
 2015-04-26 20:05:49 +03:00
Kelenius
37e2c6e109 Removes a wild unused file 2015-04-26 18:13:10 +03:00
Kelenius
b7a628d53d Merge branch 'dev' into ofBotsAndMobs 
Conflicts:
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/robot/robot_parts.dm
 2015-04-26 17:18:20 +03:00
PsiOmega
fe09ed1a22 Merge remote-tracking branch 'upstream/dev' into BorgModules 
Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/mob/living/silicon/ai/subsystems.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_upgrades.dm
 2015-04-26 15:52:18 +02:00
PsiOmega
9df5048dbc Makes it possible for borg modules to include specific subystems. 2015-04-26 15:42:36 +02:00
Kelenius
baf19eb862 Merge remote-tracking branch 'origin/dev' into ofBotsAndMobs 2015-04-26 15:47:38 +03:00