cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-17 12:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,136 Commits 8 Branches 0 Tags
fb6b94de8773e6855b362faf84ef8e0f427e608f
Commit Graph

5021 Commits

Author SHA1 Message Date
PsiOmegaDelta
3a55b130a0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	.travis.yml
	code/modules/virus2/disease2.dm
	maps/exodus-5.dmm
 2015-08-14 08:34:42 +02:00
mwerezak
76b6b90299 Adds armor_penetration values to energy weapons 2015-08-13 22:38:53 -04:00
HarpyEagle
2e8f927085 More descriptive variable name 
Renames armorpen to armor_penetration
 2015-08-13 22:38:28 -04:00
mwerezak
bb8f706943 Adds armor penetration system 2015-08-13 22:23:00 -04:00
Chinsky
94f0ceffe1 Merge pull request #10200 from mwerezak/gun-desc 
Renames of various firearms (squashed version)
 2015-08-14 03:55:43 +03:00
Chinsky
701515ae88 Merge pull request #10202 from mwerezak/20150713-molotov-cocktail 
Rag and drink bottle improvements
 2015-08-14 03:55:35 +03:00
Chinsky
c664ca6096 Merge pull request #10276 from mwerezak/uplink-items 
Allows traitors the option of purchasing the C-20r or STS-35
 2015-08-14 03:55:03 +03:00
Chinsky
c5d54ba454 Merge pull request #10455 from mwerezak/t-scanner 
Adds client image based t-scanner
 2015-08-14 01:39:36 +03:00
mwerezak
7dcd599a37 Allows bedsheets to be cut up into rags 2015-08-13 18:37:18 -04:00
mwerezak
b5425e0bd9 Makes beer and ale bottles into actual bottles, adjusts bottle smashing 
Generalizes opening drink containers, makes beer and ale bottles a subtype of bottle instead of can
Adjusts bottle smashing, duration, damage, and reliability.
 2015-08-13 18:37:13 -04:00
mwerezak
7198f98058 Improves support for rags as reagent containers 
Rags now hold just under half a glass worth of reagents.
Fixes rags wiping down a mob while smothering them.
Rags can now be wrung out over a container or the floor, emptying it's
contents.
When wiping down stuff, a small amount of the rag's contents are
splashed onto the atom.
 2015-08-13 18:32:51 -04:00
PsiOmegaDelta
d1e8f670b2 qdel(reagent) adjustments. 
Attempts to ensure qdel(reagents) only occur once per Destroy()
 2015-08-13 10:26:31 +02:00
Zuhayr
59d0e28aff Allowed pAIs and AIs loaded into hardsuits to move and rest when control is enabled or the user is unconcious/dead. 
Allows AIs/pAIs in rigs to use the selected module via middle click.
 2015-08-13 17:09:22 +09:30
Zuhayr
231eaf7e76 Added antag uplink option for hacked supply pod. 2015-08-13 16:59:18 +09:30
PsiOmegaDelta
efef67a3e4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-13 09:11:05 +02:00
PsiOmegaDelta
1b10f78940 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-08-13 09:01:10 +02:00
Kelenius
3b1b8a33c6 Merge branch 'dev' into ofSleepersAndNano 
Conflicts:
	maps/exodus-1.dmm
	maps/exodus-2.dmm
	maps/exodus-3.dmm
 2015-08-13 09:49:34 +03:00
Kelenius
d8d94b9d64 Merge branch 'dev' into ofSleepersAndNano 
Conflicts:
	code/game/machinery/Sleeper.dm
	maps/exodus-1.dmm
 2015-08-13 09:20:51 +03:00
PsiOmegaDelta
db565ae2ff Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery 
Conflicts:
	code/datums/datacore.dm
	code/defines/obj.dm
 2015-08-13 08:11:32 +02:00
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
GinjaNinja32
477a9b8dba Merge remote-tracking branch 'upstream/dev' into client_dir 2015-08-13 05:55:05 +01:00
Chinsky
6781e05bd6 Merge pull request #10086 from mwerezak/arrows 
Adds the ability to draw arrows with crayon
 2015-08-13 07:24:03 +03:00
Chinsky
3fd8627bd7 Merge pull request #9996 from PsiOmegaDelta/150702-AtmosAnalyzeCleanup 
Refactors gas analyzation.
 2015-08-13 07:23:10 +03:00
Chinsky
2b965d7cd7 Merge pull request #9907 from Zuhayr/windowspawner 
Ported window spawner, tyvm WrongEnd
 2015-08-13 07:22:58 +03:00
GinjaNinja32
792d6e2864 Merge pull request #10579 from mwerezak/misc 
Fixes
 2015-08-12 22:21:34 +01:00
HarpyEagle
19fbc71249 Removes req_amount from stack_recipe_list 
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572.
 2015-08-12 15:54:16 -04:00
PsiOmega
ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
 2015-08-12 21:18:18 +02:00
Chinsky
0e52b3d4df Merge pull request #10562 from PsiOmegaDelta/150812-OneCrew 
Fixes the One Crew Member module.
 2015-08-12 20:38:52 +03:00
Chinsky
e562affd13 Merge pull request #10551 from PsiOmegaDelta/150812-RuntimeFixes 
Runtime fixes.
 2015-08-12 20:38:20 +03:00
HarpyEagle
a62edc5b3a Fixes #10548 2015-08-12 12:21:28 -04:00
PsiOmegaDelta
249db0b03d Fixes the One Crew Member module. 
Didn't return properly in install().
Override transmitInstructions() when addAdditionalLaws() was more than sufficient.
 2015-08-12 14:42:52 +02:00
PsiOmegaDelta
3e4ec4d7b7 NanoUI windows now close on Destroy(), preventing all sorts of qdel issues. 2015-08-12 09:41:22 +02:00
PsiOmega
e4f6436a85 Fixes #10494. 
Borgs have their very own custom little headset, so cute.
 2015-08-11 21:11:16 +02:00
GinjaNinja32
631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
 2015-08-11 18:47:05 +01:00
Chinsky
7b1656f40c Merge pull request #10470 from Karolis2011/dev-freeze 
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
 2015-08-11 20:07:06 +03:00
Zuhayr
7bd301161f Merge pull request #9988 from PsiOmegaDelta/150702-SpellFixes 
Magical fixes.
 2015-08-12 01:54:31 +09:30
SomeoneElse
8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
PsiOmegaDelta
54162f1c7d Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes 2015-08-11 12:20:54 +02:00
Kelenius
1324e69a19 Fixes #10466 - chem implant can't be loaded 
What the literal shit.
 2015-08-11 10:26:22 +03:00
PsiOmegaDelta
4bb6749f24 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-11 08:34:46 +02:00
PsiOmegaDelta
e1aff6a668 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm
 2015-08-11 08:21:06 +02:00
Hubblenaut
3fb52ab4d5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-08-11 00:51:18 +02:00
Atlantis
40cb786986 Adds EMP monitoring for future EMP debugging 
- Adds possibility to enable EMP debugging, that monitors how long emp_act() took on object. If it took too long (configurable) it generates a message. It is disabled by default due to possible performance loss with large EMPs.
 2015-08-10 22:58:33 +02:00
PsiOmega
570806046b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/custom_sprites.dm
	code/modules/organs/organ_stump.dm
	code/setup.dm
 2015-08-10 17:56:14 +02:00
PsiOmega
6a15611711 Explosion particle GC. 
Explosion particles cheated, only nulling the location and hoping to get collected one day.
 2015-08-09 12:35:07 +02:00
mwerezak
11d959e767 Adds client image based t-scanner 
Replaces the t_scanner implementation with one that sends overlays to the client holding the t-ray item. Fixes #9437
 2015-08-08 22:26:38 -04:00
PsiOmega
e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
 2015-08-08 15:34:51 +02:00
PsiOmegaDelta
c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix 
Material stack related fixes
 2015-08-08 09:56:25 +02:00
HarpyEagle
fc7e89380e More material renames 
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
 2015-08-07 17:10:35 -04:00
PsiOmegaDelta
a6d9002806 Merge pull request #10442 from Baystation12/dev-freeze 
Dev freeze
 2015-08-07 10:37:47 +02:00