a8ec1c76df
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/game/machinery/computer/computer.dm
code/game/objects/items/weapons/explosives.dm
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/musician.dm
code/game/objects/structures/tables_racks.dm
code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
ee1e30717a
Merge pull request #9980 from LaharlMontogmmery/ContentTransfer
...
Container Content Transfer - Good for Review (Again...Again.)
2015-06-21 00:09:19 +01:00
a2948ba203
Merge pull request #9956 from Jordie0608/whocodesthecodemen
...
Various admin improvements
2015-06-20 00:53:30 -05:00
373c918a4a
Going through some hOOPs - bit of a overhaul.
2015-06-18 17:40:35 +02:00
b2e84a0d3c
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
2015-06-14 20:11:40 +01:00
a67de221cc
JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging
2015-06-14 23:37:35 +10:00
4de75c539f
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/game/objects/structures/crates_lockers/closets.dm
code/game/objects/structures/table_frames.dm
code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
c2256d41fc
BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH
2015-06-13 13:58:08 -07:00
d72cb4bdf1
Merge branch 'master' of https://github.com/tgstation/-tg-station into ReactionaryExplosions
...
Conflicts:
code/game/machinery/doors/poddoor.dm
code/game/turfs/simulated/floor/plating.dm
code/game/turfs/unsimulated/walls.dm
code/modules/admin/admin_verbs.dm
2015-06-11 16:23:45 +01:00
a19f1801ff
Merge pull request #9699 from KorPhaeron/turf
...
Changes how destroying/building turfs works
2015-06-02 23:15:42 -05:00
905f350597
Merge branch 'unsimulatedIsKill2' of git://github.com/Aranclanos/-tg-station into Aranclanos-unsimulatedIsKill2
...
Conflicts:
code/game/smoothwall.dm
2015-06-02 13:45:56 -05:00
dea72572c1
Created a new path of turfs, /turf/indestructible, they are only walls, turfs that are non interactive and static, like the splash screen or the borders of the different spawn spots of centcomm Z level (like wizard or nuke ops)
...
Fixes a few dirs of turfs in centcomm
2015-06-02 14:38:55 -03:00
bd0f38f1bc
Merge pull request #9535 from RemieRichards/IBetYouDontEvenUnderstandSmoothwalls
...
Ports /vg/s Smoothwall code
2015-06-02 16:31:42 +10:00
e7c0d7e95c
Removes unsimulated turfs.
...
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03:00
97990c94cc
Changes how destroying turfs works
...
Turfs now have a baseturf var which determines what is "under" every
turf. The default is space.
Actions that previously did changeturf(/turf/space) (like bombs or RCD
deconstruction) now do changeturf(baseturf). Functionally the same for
the station, but allows special turf types that don't break to space
(such as planet tiles).
Right now the asteroid tiles are the only thing with a baseturf other
than space (the baseturf is an asteroid tile).
Baseturf is tracked when new things are built, so building a floor and
then a wall on the asteroid tile, and then bombing that wall will return
it to an asteroid tile, not space.
Allows building on asteroid tiles now that doing so wont randomly make
holes to space. Time for giant mining forts.
I should have done this years ago for away missions.
Also added myself to admins.txt
2015-05-29 18:43:34 -05:00
802ff2dfa6
Merge pull request #9464 from Firecage/reinforcedfloorfix
...
Fixes infinite rods from reinforced floors
2015-05-21 16:01:20 +02:00
cf536a9c16
Ports /vg/s Smoothwall code, Angry all caps comments from N3X15 included.
2015-05-16 21:05:18 +01:00
ec9382c43b
Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13hassomanybugsitcountsasanecosystem
...
Conflicts:
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
2015-05-13 20:01:27 +10:00
e84ee8dd96
Fixes infinite rods from reinforced floors
2015-05-12 23:10:25 +02:00
e5dfaaf007
Fixed cyborg floor tiles being infinite.
2015-05-11 22:08:16 +01:00
7357a10f68
more fixes
2015-05-11 20:27:16 +10:00
3b98e4448d
Ports /vg/ DeityLink's new explosion effect, Blast doors are more resistant to explosions, Explosions can now take walls and doors into account (Cheaper than recursive explosions), Engine floors are more resistant to explosions.
2015-05-09 01:02:06 +01:00
26df5b6c8e
Removes mining drill power mechanic.
...
- Removes the power mechanic from mining drills and the sonic
jackhammer.
- Fixes broken borg diamond drill upgrade.
2015-05-08 10:12:22 -05:00
3606662c88
Merge pull request #9106 from phil235/BundleFix5
...
Cyborgs, MMIs, and other fixes
2015-05-02 23:59:22 +10:00
6fb1b7ba8c
Fixes broken grass sprite. Changes grass sprite to only use one sprite instead of four and makes it less flashy green.
...
Removes unused sidings sprites.
2015-04-26 15:56:47 +02:00
9132838420
Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5
...
Conflicts:
code/game/machinery/computer/ai_core.dm
code/game/objects/items.dm
code/game/objects/items/robot/robot_parts.dm
code/modules/mob/living/carbon/brain/MMI.dm
2015-04-25 19:52:14 +02:00
35047e646e
Readjusted rad effect from uranium walls.
...
mob/living/silicon/ai/ai.dm : one simplification plus "Normal" -> "Nominal".
2015-04-25 19:37:38 +02:00
a7bd5f93e1
"You hear something" set to italics.
2015-04-24 21:06:16 +03:00
1d14471d00
Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.
2015-04-24 20:50:50 +03:00
d6cc2c07c6
Fix mmi deafened indefinitely. 9078
...
Fix carp knocking borg. 7394
Replace carp knockdown by stamina dmg (for human only) (now 5 bites instead of 7 to go from 100% to crit w/o armor) 7905
Fix being stunned as a borg causing temporary blindness, deafness and muteness. 9061
Change robot out of power: now only stunned, can talk but not move or interact. Adding feedback in examine. 6170
Robots now take damage in the hottest of inferno (35,000+ K) 8840
Nerfs uranium wall radiation: 6 times less radiation (just double the effect of urafloor), chain reaction range down to 1. 6841
Fixes putting braindead/notincorpse/ghosted brains in mmi, and same for mmi in borgs, the action fails and sends a message to the ghost. 4841 7447
Fixes brains taking eye damage and becoming blind. 6039
2015-04-21 23:35:12 +02:00
4ff044dc78
Gang v3 has been tested and is now good to go!
2015-04-19 22:26:15 -06:00
081bae6740
Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
...
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
a8a2ffc123
Merge pull request #8662 from phil235/AddBloodFix
...
Fixes lack of dna in old blood.
2015-04-02 20:25:38 +11:00
0b403b3b03
Fixes lack of dna in old blood.
...
Fixes some comments about blood procs in atoms.dm
Small tweak in xeno blood blood_DNA.
2015-03-31 19:48:44 +02:00
69924a15be
plasma/ripley update
2015-03-25 18:06:26 -05:00
c25576ad6a
Merge remote-tracking branch 'upstream/master' into catwalkmachines
...
Conflicts:
code/game/objects/structures/lattice.dm
2015-03-20 17:02:00 +00:00
751fb4aaa9
Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks.
2015-03-09 21:48:45 +00:00
e724a96dd2
Merge pull request #8202 from Mandurrrh/fixinlightfloors2
...
Fixes lightup floortiles icon state changing with merge.
2015-03-09 02:04:04 -05:00
3b24de7509
Fixes lightup floortiles icon state changing with merge.
2015-03-07 11:50:39 -05:00
13e291a4e9
Merge remote-tracking branch 'upstream/master' into catwalkmachines
...
Conflicts:
code/game/turfs/turf.dm
code/modules/power/power.dm
2015-03-06 19:19:09 +00:00
a7e23d672a
Improves drill's handling of power
2015-03-05 17:12:12 +11:00
b1ff6b7220
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
...
Conflicts:
code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
15dacd50b1
Replaces cancable var with two new procs.
...
Clean up.
2015-02-21 20:15:03 +00:00
7fbf0a261b
mergeconflictfix
2015-02-20 09:06:04 -05:00
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
4ef1deb1f9
Fixes being unable to place cables on plating
2015-02-02 01:14:46 +01:00
d03ef74ebc
Merge pull request #7430 from Menshin/shuttle_underlays_fix
...
Shuttle related fixes
2015-02-01 12:46:46 +01:00
6c03fcf5e8
Added a "interior" subtype for shuttle wall that doesn't add an overlay of the destination turf on shuttle move
2015-01-29 20:41:22 +01:00
Iamgoofball
Remie Richards
Cheridan
LaharlMontogmmery
xxalpha
Jordie0608
Cheridan
Aranclanos
KorPhaeron
phil235
Firecage
GunHog
phil235
kingofkosmos
Ikarrus
pudl
Mandurrrh
hornygranny
paprka
Menshin
Swag McYolosteinen