cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-08 23:29:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 8 Branches 26 Tags
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

11085 Commits

Author SHA1 Message Date
Chinsky
328621b860 Moved cap guns to proper guns. 2015-08-14 05:51:29 +03: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
54cb084113 Merge pull request #9997 from PsiOmegaDelta/150702-MoneyMoneyMoney 
Economic strength now depends on race and job.
 2015-08-14 03:56:57 +03: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
mwerezak
1f7497063a Merge pull request #10618 from GinjaNinja32/10617 
fix #10617
 2015-08-13 16:20:32 -04:00
GinjaNinja32
1d3a2c1a31 fix #10617 2015-08-13 21:01:46 +01:00
mwerezak
c4ed6a10aa Merge pull request #10609 from PsiOmegaDelta/150813-ReagentQdel 
qdel(reagent) adjustments.
 2015-08-13 12:35:08 -04:00
Zuhayr
84678a91c1 Fixes roundend failing to scroll, fixes teams not getting shared global objectives. 2015-08-14 00:18:41 +09:30
PsiOmegaDelta
985acc9f70 Changes the supply drop types into datums. Simplifies adding additional supply packs. 2015-08-13 12:11:18 +02: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
f6df7df714 Added diona gestalt preset. 2015-08-13 16:59:37 +09:30
Zuhayr
231eaf7e76 Added antag uplink option for hacked supply pod. 2015-08-13 16:59:18 +09:30
Zuhayr
a8b801b377 Added supply beacon. 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
c1e3c73f7b Tiny sleeper fix 2015-08-13 09:37:02 +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
PsiOmegaDelta
77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
 2015-08-13 08:09:28 +02:00
PsiOmegaDelta
c63f4c62b5 Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney 
Conflicts:
	code/__defines/mobs.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job_controller.dm
 2015-08-13 08:06:11 +02:00
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
Kelenius
65a9e11a52 Merge branch 'dev' into ofBeesAndHoney 
Conflicts:
	baystation12.dme
 2015-08-13 08:33:46 +03:00
GinjaNinja32
477a9b8dba Merge remote-tracking branch 'upstream/dev' into client_dir 2015-08-13 05:55:05 +01:00
Woodrat
df92e8d1d1 Woodrat Work 7.9 - Minty Fresh Edition 
- EMP box sprite added and now used for the EMP box.
- Adjusted lights in Janitorial
- 5 Earmuffs added to Engineering. 3 to atmos, 2 in the engine monitoring room.
- Dock Port broken wire fixed and pipes removed.
- Misplaced CMD camera near the park deleted.
- Fixed EVA maint door access.
- Due to popular request, laser tag lockers now have 5 sets of equipment rather than two.
- Fixed some holodeck designs
- Slimes added to xenobio
- Random gas sensors in space near the research outpost fixed.
- CE door access fixed.
- Changed Northern Star issue tag to mint green.
- Mining z-level overhaul, mining engineering outpost given its own area. Standardized wire colors, overhauled engineering outpost on the mining z-level, added substations to each outpost.
- Empty jar added to the RD office
- Beepsky removed until I can figure out how he beeps.
- AI and status displays added to the pool.
- Random shovel now in science/cargo maintenance.
- Fire alarms and other equipment added to the coffee shop.
- Fire alarm, radio, fire extinguisher, light switches, shutters, and a button added to the IA office.
- Furniture changes to the metal chair and comfy chair.
 2015-08-12 21:47:49 -07: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
Chinsky
fc14ec9fca Merge pull request #9883 from mwerezak/ert-lights 
Adds more coloured lights
 2015-08-13 07:22:45 +03:00
Chinsky
6d4699fa32 Merge pull request #10590 from GinjaNinja32/debug 
more debug stuff
 2015-08-13 05:22:45 +03:00
GinjaNinja32
8d57f25fd5 Add a runtime-generating call to the "object was deleted via del() rather than qdel()" log, so we can get a stack trace from it 2015-08-13 01:51:40 +01:00
Atlantis
f41387a57f Communications emergency-fix 
- Comments out buggy code that caused some telecommunication machines to introduce insane delay (up to 30s)
 2015-08-13 00:07:32 +02: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
Kelenius
012fb38de2 Finalizes mechfab 2015-08-12 21:46:11 +03: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