Commit Graph

591 Commits

Author SHA1 Message Date
Swag McYolosteinen
ca714ca8c2 Merge pull request #4639 from RemieRichards/AtomPool
/tg/station Atom/Movable Pool + Pooling of Emitter beams and Say() Virtualspeakers
2014-09-19 20:03:24 +02:00
Remie Richards
e1e36145f1 Merge pull request #4684 from Menshin/SMES_terminal_2
SMES constructible terminals (reopen)
2014-09-19 16:41:36 +01:00
Cheridan
f5bf1ddaa9 Merge pull request #4809 from RemieRichards/Drones
Ports Drones from NTstation + New Improvements/Features
2014-09-17 16:56:40 -05:00
Cheridan
83390797cb Merge pull request #4844 from phil235/TypoFix
Fixing typos.!
2014-09-17 10:13:21 -05:00
phil235
8672e58e3a Fixing typos. 2014-09-15 19:50:34 +02:00
Alex
43ff5a56fe Merge pull request #4814 from Ikarrus/handholdingspoonfeeding
Shuttle Call/Recall Tracing in Announcements
2014-09-14 13:13:11 +01:00
Ikarrus
ce6b823f08 Update narsie.dm 2014-09-13 12:55:26 -06:00
ikarrus
9b8322c19d Shuttle Call/Recall Tracing in Announcements
- Emergency  shuttle call/recall announcements will say when a tracing attempt has been successful, as well as explicitly telling players how to view them
- Clarified language further on how emergency shuttle tracing is done
- Increased tracing success rate from 60% to 70%
- Removed a lot of duplicated code by moving all the priority_announce() calls to incall()
2014-09-13 12:50:38 -06:00
Remie Richards
473bcd1858 Ports Drones from NTstation + New Improvements/Features 2014-09-13 15:02:57 +01:00
phil235
d056cf1b69 Multiple machinery fixes 2014-09-12 20:39:02 +02:00
Menshin
b7aea4f050 Forgot to remove connecting from a cable for SMES (prevents inputting/outputting in the same powernet) 2014-09-10 13:16:47 +02:00
Lo6a4evskiy
82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04:00
Menshin
1d74dab7f6 Made the SMES terminal constructible/deconstructible 2014-09-03 11:13:14 +02:00
Remie Richards
ee85f7eced /tg/station Atom Pool + AtomPooling of Emitter beams. 2014-09-02 00:13:06 +01:00
Alex
837d5bc7eb Merge pull request #4456 from Ikarrus/table_prints
Fingerprints for Cables and Tables
2014-08-31 17:11:14 +01:00
Firecage
0948391502 Span classes for files in the following Modules folders: Power, Projectiles, Reagents, Recycling, Research 2014-08-23 02:02:46 +02:00
ikarrus
cb27ad34a6 Cutting cables, too 2014-08-15 19:50:09 -06:00
Aranclanos
55dd64fdc2 Adds static power value on areas. These variables should replace machines on the process list, that are only there to consume power.
This commit removes lights from the process list, about 500 of them on the current map.
The purpose of this is to reduce lag from the master controller ticker.
2014-08-06 06:57:52 -03:00
cookingboy3
64131818d8 fix for #4243, adds notification
squashed commits
2014-07-30 11:00:31 -07:00
Cheridan
ed4c58e26f Ghost Alerts p II
runes now properly show the area they're in (oops)
Narsie has been moved into her own file.
2014-07-07 15:21:32 -05:00
Alex
c65b9b7c79 Merge pull request #4062 from Menshin/powernet_machine_connection
Powernets machines connection polishing
2014-07-07 11:55:52 +01:00
Menshin
92c70b8742 Delegated the panels and trackers control to Solar Control Computers instead of the Sun controller. 2014-07-04 21:42:36 +02:00
Menshin
e65919da42 Removed the now unused directwired variable 2014-07-02 23:58:12 +02:00
Menshin
b158820043 Fix merging powernet on turf sometimes not connecting machines. 2014-07-02 19:01:11 +02:00
Cheridan
b02b93ce2a Notifications + Random Stuff
Adds sound notifications for Ninja and Wizard Apprentice spawning -- hopefully means fewer afk antags.

Adds a ghostnotice span class, used in the new notify_ghosts proc. Upon creation, things that require ghostly attention (NarSie, golem runes) give more visible messages to the dead.

Retires the 'moderate' span class, which was only used in tomato throwing? Refactors tomato code (this ended up being the meat of this PR, somehow...)

Reorganizes some item definition/procs.
2014-07-01 23:16:02 -05:00
Menshin
c6c8c58ef7 Machines de/connecting from/to a powernet will now always call the connect_to_network/disconnect_from_network procs instead of de/connecting directly. 2014-07-01 18:54:41 +02:00
Ben G.
e5bc43d12e Merge pull request #4008 from advomach/master
List lookup to actual math
2014-06-27 19:43:55 -05:00
Menshin
788a97471f Fixes _make_pownernets_ proc not adding the first cable found to its cable list.
Fixes #4011.
2014-06-25 15:49:50 +02:00
advomach
79447673a0 Update singularity.dm
Removed comment
2014-06-24 19:00:41 -04:00
advomach
48098c3249 Replaced var/sizes_to_number with weirdass formula that is faster and takes up less space in code than list lookups 2014-06-24 11:37:03 -04:00
Cheridan
5cfa0df3d2 Merge pull request #3790 from Miauw62/bestiality
Fixed #3077. Singularity now sucks small items instead of large ones.
2014-06-21 01:13:13 -05:00
Miauw
75a0eadb37 Removes an unneeded unEquip(). 2014-06-19 19:00:10 +02:00
Kelenius
a8b7588c12 Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp
Conflicts:
	code/game/objects/items/weapons/grenades/ghettobomb.dm
	code/game/objects/structures/door_assembly.dm
2014-06-19 02:27:10 +04:00
Alex
02d4a5a0d2 Merge pull request #3904 from Cheridan/sillynarnar
Nar-Sie update
2014-06-16 10:37:35 +01:00
Giacomand
bc945b6c92 Fixes the gravity generator not updating your gravity status, so you stop floating. 2014-06-13 20:17:11 +01:00
ikarrus
df285ff7b3 Resolved conflicts:
code/modules/mob/mob.dm
2014-06-13 09:04:30 -06:00
Cheridan
8796e6e914 Update singularity.dm
smoke effect when ghosts arise as harvesters
2014-06-13 08:48:14 -05:00
Cheridan
b80e9eda57 Nar-Sie update 2014-06-11 14:19:58 -05:00
Kelenius
3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
Rockdtben
569d12facf Moved item_heal_robotic out of obj/item and into mob_helpers.dm 2014-06-05 19:25:08 -05:00
ikarrus
40800b79e0 The Loggening: Admin Edition
-Build mode logging. A lot of its functions are highly abusable but not logged
-Gravity Catapults no longer spam asay. They will be kept in the game log.
-Logging for Cyborg handcuffs
-Logging for Stripping/equipping
-Logging for decreasing PA power control. Easier as an admin to tell when I should panic without having to watch them like a hawk.
-Logging for disposaling people
-Some code optimizations along the way as well
2014-06-02 23:13:33 -06:00
Menshin
6749f21042 Tweaked the power distribution handling :
* the power is correctly handled each tick instead of 1 tick on 2, because of bad reinitalization,
* apcs now draw power as others machines and fixed the amount of power send to them

Partially fixes #3761.
2014-05-25 00:54:41 +02:00
Miauw
9ed94fcb78 Makes this actually work properly. It's always harder than it looks. 2014-05-24 19:18:17 +02:00
Miauw
9e080d555f Fixed #3077. Singularity now sucks small items instead of large ones. 2014-05-24 17:45:36 +02:00
Cheridan
36bb032957 Merge pull request #3509 from Cheridan/MeteorsSuck
Meteor Stuff
2014-05-17 18:42:16 -05:00
Alex
503fa19098 Merge pull request #3695 from Menshin/powernets_alternative_refactoring
Updated Powernets Refactoring
2014-05-15 13:55:01 +01:00
Alex
3247358c6d Merge pull request #3480 from AstralSerpent/master
"NAR-SIE HAS RISEN" gets accompanied by an "I'M HERE" sound.
2014-05-14 10:39:10 +01:00
Alex
b35097ae83 Merge pull request #3633 from Menshin/powernets_refactoring
[RFC] Powernets refactoring
2014-05-14 10:21:21 +01:00
Alex
6686b2ec7c Merge pull request #3687 from Jordie0608/removerelativepathsfromtheeverythingplz
Fixes #3681: suicide messages when crit
2014-05-14 09:24:29 +01:00
Cheridan
3a0bd3de28 Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck
Conflicts:
	code/game/turfs/simulated/walls.dm
2014-05-13 14:03:42 -05:00