cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-20 11:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,136 Commits 11 Branches 0 Tags
fb6b94de8773e6855b362faf84ef8e0f427e608f
Commit Graph
10596 Commits
Author SHA1 Message Date
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 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
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
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
PsiOmegaDelta 93e666e67c Adds a missing not-null check that is made in another case. 2015-08-12 09:22:46 +02:00
PsiOmegaDelta 32338716bf Re-adds missing bot check. 
Not all bots are of the type /mob/living/bot yet. Re-adds the /obj/machinery/bot-type check on airlock bump.
Fixes #10507.
 2015-08-12 08:28:39 +02:00
GinjaNinja32 8915edcce2 Merge pull request #10537 from mwerezak/mapping-fixes 
Fixes and mapping
 2015-08-12 06:39:30 +01:00
mwerezak a90e1f3f7e Fixes #10501 
Also future proofs spaceheaters
 2015-08-12 01:16:08 -04:00
GinjaNinja32 5a1c80d843 Fix for non-ANTAG_OVERRIDE_JOB antags breaking with malf fix 2015-08-12 05:06:18 +01:00
GinjaNinja32 54930b69b4 Malfunction 2015-08-12 04:41:59 +01: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
mwerezak 8064a76f39 Merge pull request #10484 from atlantiscze/laptop-quickfix 
Fixes #10136
 2015-08-11 13:06:32 -04:00
Chinsky 4c628ff2c5 Merge pull request #10483 from PsiOmegaDelta/150811-AntagName 
Fixes #10468 and #10467
 2015-08-11 19:39:15 +03:00
Zuhayr 7bd301161f Merge pull request #9988 from PsiOmegaDelta/150702-SpellFixes 
Magical fixes.
 2015-08-12 01:54:31 +09:30
Atlantis d63d2817a1 Fixes #10136 
- Quick fix for #10136, laptops now use the #define-d values rather than hardcoded strings. Camera net keys work again properly.
- I also adjusted laptop's power usage. With how it used to be, you could buy laptop and let it run for whole shift, never having to recharge even with weakest cell. Right now, it lasts about 10 minutes on worst cell, and almost one hour on the best one. Actual power usage (in watts) is slightly lower than stationbound consoles.
 2015-08-11 12:42:26 +02:00
SomeoneElseandKarolis2011 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
PsiOmegaDelta f85e9146ab Fixes #10468. Fixes #10467. 
Updates the DNA name as well, upon antag name change.
 2015-08-11 12:11:32 +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
PsiOmegaDelta ef9ebdc741 Merge pull request #10476 from atlantiscze/emp-fix 
Fixes #10446
 2015-08-10 23:09:35 +02:00
Atlantis dd79e0f481 Fixes lengthy emp_act() for turret controllers and doors. 
- Turret controllers were the same as turrets. Now completely fixes #10446
- Doors also had 10ds sleep() in them, hidden under small probability roll. Fixed.
 2015-08-10 23:04:37 +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