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
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
b544a945a9
Fixes issue #2489
...
Fixes issue #119
Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX
Added two extra options to the spawn menu of the game panel, clothing and food.
2014-05-01 06:01:14 -03:00
cc34aae3e3
Reisin walls and doors will now block superconductivity (heat)
...
Reisin membranes won't
2014-04-30 07:40:41 -03:00
19402bd258
Handle alpha 0
2014-04-27 15:57:18 +02:00
fcf98c15f9
Checking for divide by zero
2014-04-27 14:41:53 +02:00
4c7cbeff08
Fixes bad indent
2014-04-27 14:34:52 +02:00
14ad291ba2
Merge remote-tracking branch 'upstream/master' into smoke_fade
2014-04-27 14:16:55 +02:00
5a197e8dec
Adds a fancy fade-out for smokes
...
Originally from Bay.
Made by Loganbacca, ported by me.
2014-04-27 14:16:50 +02:00
a3b01d017e
Merge pull request #3495 from phil235/CocoonattackedmsgFix
...
Fix for #3151
2014-04-23 15:12:38 +01:00
f83f1932b2
Meteor code uses OOP principles a little better now
...
Adds new types of meteors with different effects.
Meteors drop some ore when they hit.
2014-04-23 01:37:44 -05:00
382397a6ea
Fix for #3151
...
Removes the useless periods.
2014-04-21 19:36:33 +02:00
fc915bf800
If you try to use the teleporter and the teleport was rejected for any reason (like having a nuclear disk), you won't get the chance to get a random damage from the teleport.
...
Fixes issue #2236 .
Removed some spawn() calls.
Removed the chance of fail from the portal effects (the blue portals made with hand teleporters).
The portal datums will now return 0 if the teleport failed, and now use a new proc, start(), instead of New() to handle themselves.
Standarized teleport.dm from the helper_datums folder.
Removed the checks for centcomm z level and away missions z level for teleports. Now you can go there.
changed the /red messages from the teleports datum to span classes.
The "[something] bounces off of the portal!" were replaced for "The portal rejects [something]".
Removed an extra "the" on those messages.
2014-04-02 08:36:33 -03:00
7bcb69ad88
Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.
...
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
2014-03-28 06:32:47 -03:00
8af8a43d6f
Initial pass to convert LF to CRLF
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-03-24 08:53:40 +00:00
KyrahAbattoir
Hornygranny
ikarrus
Cheridan
MrPerson
JStheguy
JStheguy
Firecage
Swag McYolosteinen
Aranclanos
AndroidSFV
fleure
VistaPOWA
phil235
Mloc-Hibernia