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
27,372 Commits 9 Branches 0 Tags
f54dd94a66e5d94975d0b51ec20655c5e165ca22
Commit Graph

1000 Commits

Author SHA1 Message Date
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
 2015-12-06 11:34:36 +01:00
Zuhayr
c2a4ee22cf Merge pull request #11316 from atlantiscze/apc-fix 
Fixes #11149
 2015-12-02 09:57:26 +10:30
Atlantis
e33ae21f75 Adjusts APC emag behavior 
- Mostly under-the-hood changes.
- Emagged APCs may now have their panel removed with screwdriver, so you can access wires
- Emagged APCs no longer rely on locked var, instead they check for emagged var as mwerezak suggested.
 2015-11-30 23:19:04 +01:00
PsiOmegaDelta
461023b5e7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-10-31 16:31:05 +01:00
Daranz
4b42f69247 Fix a problem with solar control computers not connecting to powernets on build 2015-10-28 13:35:24 -04:00
Atlantis
cbcddcad53 Adjustment according to PsiOmegaDelta's suggestion 2015-10-16 14:44:01 +02:00
Atlantis
c3e1611178 Fixes #11149 
- Corrects APC behavior when hacked by malfunctioning AI.
- It should now be possible to hack the APC to unlock it even when it is hacked by the AI. Normal IDs still don't work on hacked APCs.
- A little side-fix, removal of malfunctioning AI's hack of an APC should now work correctly.
 2015-10-16 14:38:20 +02:00
PsiOmegaDelta
f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-09-11 08:38:28 +02:00
PsiOmegaDelta
2007004f3c Qdel cleanup. 
Replaces a few instances of del() with qdel().
 2015-09-09 12:20:33 +02:00
PsiOmega
8dea4d40c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-07 08:01:15 +02:00
Zuhayr
dd81250b1b Merge pull request #10784 from Kelenius/masterRuntimes 
Fixes two runtimes
 2015-09-07 14:01:24 +09:30
PsiOmegaDelta
d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-08-27 08:53:22 +02:00
mwerezak
7c96829ecd Fixes #10828 
Adds a slick red emergency light to the engineering escape pod, updates other pods to match.
 2015-08-23 18:19:22 -04:00
Kelenius
c074f9ee9e Fixes a runtime with lights during explosions 2015-08-21 13:01:35 +03: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
PsiOmegaDelta
1b7b69306c Prevents APC wires from being displayed to the AI. 
Restores and makes the mob type check more specific. Fixes #10559.
 2015-08-12 13:34:12 +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
7f2d6e8b7f Merge pull request #10434 from Kelenius/ofCablesAndSnowflakes 
Of cables and snowflakes
 2015-08-11 19:40:45 +03: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
Kelenius
92ca942fa9 Fixes #10219 - cables don't always qdel 
Dem snowflake code
 2015-08-05 18:13:38 +03:00
mwerezak
d1bd146b1a Changes reinforced glass material name 
Gives the reinforced glass material a name that is easier to verify for
correctness.
 2015-08-03 23:01:34 -04:00
mwerezak
0ceb0e291d Fixes #10314 
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
 2015-08-02 00:01:10 -04:00
PsiOmegaDelta
388343a84e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/recharger.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob.dm
 2015-07-20 08:28:32 +02:00
Zuhayr
a45d26079f Merge pull request #10239 from mwerezak/lighting-fix 
Fixes #10210
 2015-07-19 20:13:55 +09:30
mwerezak
ac2dd5f3ca Fixes #10210 2015-07-19 00:25:09 -04:00
Zuhayr
c779482afc Merge with dev. 2015-07-15 16:20:39 +09:30
mwerezak
0b2b475be4 Adds lights to ERT shuttle, ERT ready light 
Fixes #10155
 2015-07-12 18:41:24 -04:00
PsiOmegaDelta
b5a47fd43b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/power/rust/core_gen.dm
	code/modules/power/rust/fuel_compressor_construction.dm
	code/modules/power/rust/fuel_injector.dm
 2015-07-01 22:46:40 +02:00
Zuhayr
8ab80b7394 Removes the RUST engine. 2015-07-01 15:50:55 +09:30
Zuhayr
f096d5cabe Merge resolution. 2015-06-28 06:13:24 +09:30
Zuhayr
411987c68b Merge resolution with master. 2015-06-28 06:02:52 +09:30
GinjaNinja32
98572db1a0 Merge pull request #9940 from atlantiscze/connection_estabilished 
Fixes #9929
 2015-06-26 19:24:24 +01:00
Atlantis
90f08d3fa7 Fixes #9929 
- Adds missing connect_to_network() and disconnect_from_network() into TEG wrenching code.
 2015-06-26 18:22:59 +02:00
Zuhayr
6f00d831e5 Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct 
Base proc: emag_act
 2015-06-21 01:18:25 +09:30
PsiOmegaDelta
307f36e919 Compilation fixes. 2015-06-16 11:03:25 +02:00
PsiOmegaDelta
06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-06-16 10:52:33 +02:00
PsiOmegaDelta
cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
PsiOmega
0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
Zuhayr
347e6df2ac Merge pull request #9704 from atlantiscze/clean-up-your-trash 
[Done] Implements Destroy()'s on some things
 2015-06-10 23:07:38 +09:30
Zuhayr
73146a62fe Merge pull request #9747 from PsiOmegaDelta/150608-NanoPaths 
NanoUI sources can now be datums instead of atom/movable.
 2015-06-09 20:08:02 +09:30
PsiOmegaDelta
20542bf84b NanoUI sources can now be datums instead of atom/movable. 
Also accidentally fixes #7042 as the AI no longer cares about the machinery var.
 2015-06-08 17:06:06 +02:00
Chinsky
94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors 
Ports /tg/'s meteors.
 2015-06-08 14:17:57 +03:00
PsiOmegaDelta
81ee9178bd Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-08 09:57:33 +02:00
Atlantis
41d4c2eb13 Refactors /obj/item/apc_frame to /obj/item/frame/apc 
- This fixes broken APC frame placement on walls - #9537
 2015-06-07 06:26:10 +02:00
Atlantis
8a5a969002 More Destroy()s, better implementation 
- Re-implements Destroy() for SMES units. This time moves relevant (de)construction code all the way up to obj/machinery/. This should fix any potential GC issues with deconstruction of component-based machines.
- Implements Destroy() for breaker boxes.
- Fixes SMES units lacking disconnect_terminal(), causing GC errors.
 2015-06-06 11:04:41 +02:00
Atlantis
b16bf61d03 Implements Destroy() for buildable SMES units. 
- This also means GC errors for SMES coils and probably cable coils are fixed. Both of these things are in used in SMESs' construction components.
 2015-06-06 09:43:39 +02:00
PsiOmegaDelta
bad9c103eb Merge remote-tracking branch 'upstream/dev' into 150605-Meteors 
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
 2015-06-05 14:59:52 +02:00
PsiOmegaDelta
a07d20d657 Ports /tg/'s meteor implementation. 
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
 2015-06-05 14:58:35 +02:00
Chinsky
e3f64178c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade 2015-06-05 13:24:03 +03:00
PsiOmegaDelta
c3f0a46c19 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/briefcase.dm
	html/changelogs/.all_changelog.yml
 2015-06-05 10:39:41 +02:00