e611301f0f
Merge pull request #5044 from Jordie0608/mapmergersoannoying
...
Fixes #4788 Resin walls on the abandoned mining station
2014-10-07 19:39:12 -07:00
f96b017149
Merge pull request #5097 from phil235/Msg1Fix
...
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
208b136996
Merge branch 'master' of https://github.com/tgstation/-tg-station into mapmergersoannoying
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-10-07 21:56:06 +11:00
5b8b883cf0
Merge pull request #5050 from Incoming5643/spiders,man
...
Updates spiders to have full player functionality
2014-10-06 14:24:39 +01:00
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
651c3e6db5
Merge to master - sole conflicting file was ninja.dm FUCK NINJAS
2014-10-04 01:45:39 -07:00
8e99152226
Updates spiders to have full player functionality
...
*All spiders can now web turf (but AI controlled non-nurses won't choose to), only nurse spiders can wrap items and lay eggs.
*Eggs laid by a player controlled nurse spider will eventually grow into player controlled spiders, while AI lain eggs will only result in AI spiders
*Adds non nurse spiders to the staff of change as they pass my rules for inclusion (Leaves a corpse, can do everything as a player the NPC can do, can't dominate a round by reproduction)
I take no responsibility for spidercode, it's a bit iffy but as far as I can tell it all works for players now.
2014-10-01 18:58:07 -04:00
210e4f12b5
Fixes resin walls icon on map maker + abandoned mining station
2014-10-01 13:41:48 +10:00
3248e23887
Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix
...
Conflicts:
code/modules/recycling/disposal.dm
2014-09-25 18:45:53 +02:00
3f451f9b1b
Warning cones can be worn on your head, with original codersprites.
2014-09-19 22:44:59 +03:00
87d7c9e91e
Create the audible_message() proc to replace most instance of " for(var/mob/M in hearers(...) show_message(..., 2)"
...
fixing typos and missing emotes in emote lists.
2014-09-14 01:15:15 +02:00
e36189772a
fixes resin runtime, weeds and walls update icons properly on destruction
2014-09-11 14:40:35 -07:00
12a926ae9e
Merge pull request #4532 from hornygranny/smoothaliens
...
alium update
2014-09-09 14:54:43 -05:00
5f33e3d713
old alien sprites, description updates
2014-09-09 11:21:41 -07:00
20d9e6c2b2
Because aparently we can't have nice things.
2014-09-08 17:26:28 +02:00
02e527e938
Merge branch 'smoothaliens'
...
Conflicts:
code/_onclick/hud/screen_objects.dm
code/modules/mob/living/carbon/alien/alien.dm
2014-09-07 21:33:48 -07:00
c2827a64a0
lowered weeds layer
2014-09-02 10:53:36 -07:00
bf5f5e5922
Resolved Conflicts:
...
_maps/map_files/tgstation.2.1.3.dmm
2014-09-01 22:58:23 -06:00
ed9ef3c3e3
Merge pull request #4583 from JStheguy/master
...
NT Poster Port
2014-09-01 17:49:44 -05:00
01b01609fe
egg click cooldown fixed, HEADCOVERSMOUTH removed from inappropriate items
2014-08-29 16:38:27 -07:00
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
72760368b5
fixed icons not changing on wall destruction
2014-08-28 16:33:36 -07:00
1d61d02af7
qdel
2014-08-28 14:24:40 -07:00
8b19b2bb38
cleanup
2014-08-28 11:50:02 -07:00
5a928fd7a1
Replaced all the static items in maintenance by random item spawns.
...
Replaced the numerous "copy paste" racks of meson/firesuit/gasmask piles with proper firefighting lockers.
2014-08-28 13:12:40 +02:00
c9d13e7aa7
no more hideous smoothtable shit
2014-08-27 18:32:28 -07:00
04d7d954d2
awful awful table smoothing pasta replaced with smoothwall modification
2014-08-27 17:16:49 -07:00
ae64c526ad
Okay yeah some changes
...
Error posters link to /tg/ issues page now.
Also syndie revolvers have 7 shots so yeah change because facts
2014-08-27 07:14:43 -05:00
0dc184004c
NT Poster Port
...
-Adds all them NTstation posters and the poster subtype system.
2014-08-26 19:03:03 -05:00
6c7af5eb32
SPANCLASSES!!!!!
2014-08-26 09:52:13 +02:00
2602aeebc8
aliums 2spukki
2014-08-22 10:13:18 -07:00
0891744c8e
Resolved Conflicts:
...
_maps/map_files/tgstation.2.1.3.dmm
2014-08-21 19:47:30 -06:00
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
5e696e9cd7
Merge pull request #4374 from kyrahabattoir/DynamicMaintenanceLoot
...
Dynamic maintenance loot table and map modification.
2014-08-18 19:27:02 +02:00
7fb2e5351b
Removed flash from the maintenance loot table.
...
set armory_contraband to not spawn duplicates (as it initially was).
2014-08-18 05:41:52 +02:00
37f9716fb5
Added loot tables for the maintenance and the contraband locker (removed the map edit for now)
2014-08-18 05:40:15 +02:00
be077176ee
Used the gibspawner instead
2014-08-16 19:17:39 -06:00
d56274a4ab
Adds Deathsquad to Quick-Create Antagonist Menu
...
-Pressing this button will spawn up to 5 death commandos on centcom with a customizable objective
-Added a shuttle console to the ferry that, rather than moving the shuttle, will send a request to admins instead
-Deathsquaddies get an energy shield
-Deathsquad beret will no longer hide head, face, and hair
2014-08-16 00:40:37 -06:00
22743b77f4
Adds asbolute paths to some effect files.
2014-08-07 18:59:06 +02:00
ccae5781c5
added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.
...
Added melee click cooldown for paper spam on cameras.
2014-08-03 22:14:56 -03:00
817278e5ad
Resin walls and weeds cannot be mash-attacked.
2014-07-30 21:04:34 -05:00
7779a2f7e8
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-20 21:10:53 +02:00
a89054dfaa
Resolving Conflicts:
...
_maps/map_files/tgstation.2.1.3.dmm
code/controllers/configuration.dm
config/game_options.txt
2014-07-01 13:31:08 -06:00
c65aa2b5a4
Merge pull request #4000 from Cheridan/terribleidea
...
MONKEY MODE REDUX
2014-06-30 16:27:22 -03:00
bf5200daf8
[Config] Security Officer Scaling
...
Intended for high-population servers
Open security officer positions scale with population, between 5 slots at ~40 players to 12 slots at ~96 players
Default coefficient is 8, but may be modified (or disabled) in the config.
Extra lockers will spawn if there aren't enough lockers.
2014-06-15 21:24:07 -06:00
352d5a5627
MONKEY MODE REDUX
...
AHUAHEUAHUHEGUEHGAUHEGUAEH
monkeys will now possibly transfer all diseases on bite because that's how diseases kinda work
2014-06-14 21:30:25 -05:00
b80e9eda57
Nar-Sie update
2014-06-11 14:19:58 -05:00
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
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
e13ab9422d
Merge pull request #3610 from Aranclanos/washingmachine
...
Washing machine fixes
2014-05-13 16:55:26 +01:00
hornygranny
Cheridan
Jordie0608
Remie Richards
phil235
MrPerson
Incoming
Perakp
KyrahAbattoir
ikarrus
JStheguy
JStheguy
Firecage
Swag McYolosteinen
Aranclanos
AndroidSFV
fleure