Cheridan
f96b017149
Merge pull request #5097 from phil235/Msg1Fix
...
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
phil235
537280b4b9
Removing many instances of the no longer used second argument of message_admins() proc.
...
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
2014-10-05 01:29:30 +02:00
MrPerson
651c3e6db5
Merge to master - sole conflicting file was ninja.dm FUCK NINJAS
2014-10-04 01:45:39 -07:00
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
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
phil235
d056cf1b69
Multiple machinery fixes
2014-09-12 20:39:02 +02:00
Lo6a4evskiy
82f869c9a6
Updated to resolve conflicts
2014-09-06 13:34:43 +04:00
Remie Richards
ee85f7eced
/tg/station Atom Pool + AtomPooling of Emitter beams.
2014-09-02 00:13:06 +01:00
MrPerson
a23dbe2357
Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
...
Conflicts:
code/game/objects/items/devices/radio/radio.dm
code/game/objects/items/toys.dm
code/game/objects/items/weapons/tanks/tank_types.dm
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/events/ninja.dm
code/modules/power/cell.dm
code/modules/power/port_gen.dm
code/modules/reagents/reagent_dispenser.dm
2014-08-29 04:21:15 -07: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
MrPerson
d0c97aae72
Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
...
Conflicts:
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/game/gamemodes/cult/ritual.dm
code/game/gamemodes/nuclear/pinpointer.dm
code/game/machinery/spaceheater.dm
code/game/machinery/status_display.dm
code/game/objects/effects/decals/crayon.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/items/weapons/airlock_painter.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/items/weapons/storage/secure.dm
code/game/objects/items/weapons/tanks/tank_types.dm
code/modules/assembly/assembly.dm
code/modules/assembly/holder.dm
code/modules/assembly/mousetrap.dm
code/modules/mob/living/carbon/alien/special/facehugger.dm
code/modules/mob/living/carbon/slime/examine.dm
code/modules/power/cable.dm
code/modules/reagents/grenade_launcher.dm
code/modules/reagents/reagent_containers/food/drinks.dm
code/modules/reagents/reagent_containers/food/snacks.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/recycling/sortingmachinery.dm
Thanks Firecage, this is all your fault
2014-08-20 05:54:20 -07: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
e65919da42
Removed the now unused directwired variable
2014-07-02 23:58:12 +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
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
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
MrPerson
645ca7f8a1
Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
...
Conflicts:
code/_onclick/click.dm
code/game/atoms.dm
code/game/objects/items/toys.dm
code/modules/paperwork/folders.dm
code/modules/power/cable.dm
2014-06-09 01:50:44 -07: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
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
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
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
Hornygranny
f615b60c2a
dust now uses spawn_dust()
2014-05-06 11:46:25 -07:00
Hornygranny
1d981b9173
flavor text removed
2014-05-06 11:44:03 -07:00
MrPerson
9d9a657acf
Change examine() from an atom verb to a mob verb
...
Just in time for the feature freeze, a big change that will introduce bugs! Yay!
Mob verb is called verb/examinate(target), which just calls target.examine(user) and face_atom(target)
For explanation why, see http://www.byond.com/forum/?post=1326139&page=2#comment8198716
Long story short, mob verbs are much faster than object verbs. The goal is to make right-click menus populate faster.
Also changes a bunch of examine() procs to always, ALWAYS call the parent. Except mobs, but you have 1 guess why I'm not touching them. Mostly this affects obj/item/examine().
And also remove a whole shitload of pointless set src in view(2) kind of crap. Also span classes.
2014-05-01 09:56:39 -07:00
Hornygranny
3035108aba
used visible_message for flavor text
2014-04-30 14:17:20 -07:00
Hornygranny
2853c954c9
Narsie's consume will now spawn remains and gib mobs, and includes a flavorful message.
2014-04-30 13:36:50 -07:00
Cheridan
4d8160ab14
meteorhit() is kill
2014-04-22 12:16:02 -05:00
AstralSerpent
e589992608
NAR-SIE HAS RISEN gets accompanied by that I'M HERE hallucination sound.
2014-04-21 12:02:22 +10:00
Cheridan
412ac0fb38
Improved Singularity Ex_act()
2014-04-01 15:26:48 -05:00
Razharas
6cb3ae5183
Revert "Merge pull request #3142 from Alek2ander/master"
...
This reverts commit 6f9b58abce , reversing
changes made to eda7110a23 .
Im so sorry aran, so sorry
2014-03-29 18:02:54 +04:00
Alek2ander
358ecf7e6a
Merge branch 'master' of https://github.com/tgstation/-tg-station into tgstation-master
...
Conflicts:
code/game/machinery/computer/computer.dm
code/game/machinery/computer/telecrystalconsoles.dm
2014-03-27 18:31:11 +04:00
Mloc-Hibernia
8af8a43d6f
Initial pass to convert LF to CRLF
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-03-24 08:53:40 +00:00
Alek2ander
81b1b189de
paipairing
...
Stuff
2014-03-22 22:33:09 +04:00
MrPerson
6930283efc
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
...
Conflicts:
code/game/gamemodes/changeling/changeling_mutations.dm
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/malfunction/Malf_Modules.dm
code/game/objects/items/weapons/tanks/watertank.dm
code/game/objects/structures/tables_racks.dm
code/modules/research/server.dm
2014-03-21 03:05:39 -07:00
Aranclanos
638ca8e22e
Made the singularity name lowercase
2014-03-10 19:45:39 -03:00
MrPerson
a74cdf1da2
Made the singulo only qdel things once. Woops.
...
This was causing some runtimes and doubled reporting "Emitter deleted at (0,0,0)" etc.
2014-03-03 03:45:59 -08:00
Miauw
aacbe054ed
Alright it's really done now (aka i guarantee i'll make another commit)
2014-02-27 18:54:35 +01:00