ee3617310e
Merge remote-tracking branch 'upstream/master' into droneFix
2014-12-30 13:32:51 +02:00
9ee5d52814
Merge pull request #6601 from paprka/walkthecat
...
Adds catwalks
2014-12-29 19:05:41 -08:00
80cc2d4100
Merge pull request #6622 from Thunder12345/grammarFixes
...
Fixes for some grammer and formatting issues
2014-12-29 10:20:35 -03:00
79e2eedacb
Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-27 22:26:21 -08:00
744940c8a8
Fixes #6615
...
All instances of "Your clothes feel warm" have been given a full stop.
Couldn't actually confirm in testing due to never getting the warm
clothes message, but I don't see why it wouldn't work.
2014-12-27 18:32:45 +00:00
f8b7a2066f
Merge pull request #6559 from tkdrg/hal
...
Adds sanity checks to supermatter Consume()
2014-12-27 18:42:01 +01:00
0e4903bd83
Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-26 18:35:12 -08:00
3ca6d769a1
adds catwalks
2014-12-26 17:38:55 -08:00
3f41ca1a9a
further code optimizations in cable.dm
2014-12-26 09:26:56 -08:00
adb8989327
Nerfs the supermatter explosion back to 3, 7, 14
...
Request by a headcoder and a server host.
2014-12-25 19:47:36 -03:00
404da4dbdd
code optimizations
2014-12-25 13:28:05 -08:00
a6acdeb3c2
initial commit
2014-12-25 13:07:06 -08:00
8121ac9dba
Adds sanity checks to supermatter Consume()
...
It should only eat /mob/living and non-effect /obj now.
Fixes #6558
Also fixes the division by 0 runtime for real now.
2014-12-25 14:56:36 -03:00
d8b85dda0a
Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake
...
refactors narsie
2014-12-24 19:48:24 -08:00
579f297076
Merge pull request #6444 from tkdrg/shardopplsnerf
...
Tweaks the Supermatter a bit
2014-12-19 14:57:22 -08:00
d7e05d4387
Adds Supermatter logging and tweaks the power gen
...
Now includes an admin_investigate entry, plus three message_admins():
when first powered, when first reaching critical point, and when a mob
is dusted. Also tweaks the power generation formula a bit.
2014-12-19 18:19:48 -03:00
cd22bfc11f
refactors narsie to use the object oriented programming meme
2014-12-18 11:44:20 -08:00
62252f0273
Merge pull request #6420 from phil235/TypoFix2
...
Fixes a lot of "the the" in messages.
2014-12-17 16:06:35 -06:00
c0fb78edd5
Tweaks the Supermatter a bit
...
Reduces the amount of heat and power released. Removes redundant code.
2014-12-17 16:06:33 -03:00
5a26db0285
Merge pull request #6401 from Menshin/solars_runtime_fix
...
Fixes controless solar tracker runtime
2014-12-17 11:04:29 -08:00
d5a7d82959
Fixes a lot of "the the" in messages.
2014-12-16 22:59:55 +01:00
c021bda843
Merge pull request #6250 from tkdrg/CRYSTAL-DELAMINATION-IMMINENT
...
Ports the supermatter engine from /vg/
2014-12-16 15:26:36 +00:00
672b476f23
Tidying a little
2014-12-16 13:16:19 +01:00
51e10e6a19
Fixes controless tracker runtime
2014-12-16 01:23:29 +01:00
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
358ca52d27
Adds one span class.
2014-12-11 15:30:37 -03:00
99f364f480
makes APC call parent
2014-12-09 18:53:29 -08:00
af3f1aa4d8
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/machinery/deployable.dm
code/game/objects/items/weapons/storage/lockbox.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/modules/clothing/glasses/hud.dm
code/modules/mob/living/silicon/robot/robot.dm
2014-12-09 16:03:45 -08:00
0c5641d016
Ports the supermatter engine from /vg/
...
The SM was originally developed for bay12, but I ported the /vg/ fork.
Basically, it eats heat or atom/movables and generates radiation/power.
Everything that touches it turns to dust. If it overheats, it explodes.
Typical usage involves emitters and a cooling chamber.
Currently, these are only obtainable through cargo for 100 points.
The crate comes locked and requires CE access.
2014-12-07 09:43:36 -03:00
7758a0afed
Ok now explosions shall work properly
...
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
f909d59d1a
Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
...
Standardizing attack messages to always show the attacker first
2014-12-04 12:45:31 -06:00
b9b73531a6
Merge pull request #6104 from tkdrg/bouncy
...
Stops the field from bouncing the sing around
2014-12-01 18:14:12 +03:00
7f357963bd
- Fixes belts getting stuck in drone inventory. Fixes #5563 .
...
- Gives drones the ability to interact with APCs and air alarms without requiring them to have an ID card. Fixes #5565 .
- Drones have to be adjacent to the APC/alarm when using it, for balance.
2014-11-29 14:36:36 +02:00
65fb61be69
Stops the field from bouncing the sing around
2014-11-27 10:33:24 -03:00
c5209f2399
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-27 15:30:37 +03:00
41a43b0040
Quickfix
2014-11-27 15:30:24 +03:00
4998b19ddf
Merge pull request #5679 from Aranclanos/projectilesBump
...
Projectiles bump fix, spawn() removal
2014-11-27 03:38:05 +03:00
84e69cff6b
Conflict resolve
...
Damn cables
2014-11-24 12:27:53 +03:00
86405fa8c0
Standardizes attack messages to always show the attacker first (when there is an attacker).
...
Replacing some fo mob in viewers() show_message() with visible message().
Simplifying some message code in a couple places, fixing typos and span classes.
2014-11-24 01:49:34 +01:00
eabea41f4d
Merge pull request #5989 from Menshin/cables_cutting_fix
...
Fixes cutting cables always spawning a single red cable
2014-11-23 23:35:21 +03:00
3011261e7f
Merge pull request #5980 from Menshin/collectors_anchoring_fix
...
Radiations collectors anchoring fix
2014-11-23 15:02:28 +00:00
56bd52e95b
Fixed cutting cables always spawning a single red cable
2014-11-22 15:59:18 +01:00
c2cfa31d87
Make collectors actually connect to the powernet when wrenched down.
2014-11-22 00:32:52 +01:00
678a13c451
moves emag effects from attackby() into atom proc emag_act()
2014-11-20 17:49:06 -08:00
ff456ebaf4
Unwinded most of shit
...
Meh
2014-11-19 21:36:45 +03:00
b7d08c591e
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-18 16:23:04 +03:00
b071a0167e
Made explosions work in a slightly different way
...
Yep
2014-11-18 16:22:41 +03:00
87fe5489a7
Merge pull request #5701 from tkdrg/outoftheleftfield
...
Containment fiels bounce structure, machinery & mechs, take two
2014-11-18 04:39:48 +03:00
59aa177af7
Merge pull request #5681 from Menshin/singulo_beacon_fix
...
Singularity beacon fix and clean-up
2014-11-18 04:19:00 +03:00
Perakp
hornygranny
tkdrg
paprka
Thunder12345
phil235
MrPerson
Cheridan
phil235
Remie Richards
Menshin
Menshin
Razharas
Razharas