Whitellama
6b1ba1b6a3
Fixed #5870 : Glasses being labeled both 'glass' and 'Drinking glass' inconsistently
...
Conflicts:
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
2014-08-03 15:28:20 -04:00
Walter0o
23bc5b822c
fixes runtime with calling PP on dna-less mobs
...
Conflicts:
code/modules/admin/admin.dm
2014-08-03 15:26:36 -04:00
mwerezak
e76cc064df
Fixes siemens_coefficent not affecting shock damage
...
Also cleans up electrocute_act()
Conflicts:
code/game/gamemodes/events/ninja_equipment.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/human.dm
2014-08-03 15:24:53 -04:00
ZomgPonies
ea1f8307d0
Removed some unused vars
2014-08-03 15:14:38 -04:00
Loganbacca
5faef31f60
Train fixes and balancing
...
- Slows trains to 90% of running speed
- Changes train impact damage to only take into account speed, not train length (otherwise you could insta kill people with a long enough train)
- Fixes a bug with towed cars ghosting through closed airlocks
- Stuns mobs who fall off a train that has blown up
- Fixes mobs standing/lying on vehicles
- Fixes exploding trains not decoupling correctly
Conflicts:
code/modules/mob/mob.dm
code/modules/vehicles/cargo_train.dm
code/modules/vehicles/train.dm
2014-08-03 15:13:52 -04:00
Loganbacca
aeeafcfdb1
Reversing fix
...
- Allows cargo tugs to reverse their direction if they are not towing anything
2014-08-03 15:08:22 -04:00
Loganbacca
4d2d8cb655
Verb fix
...
- Handles verb changes in the turn_off() and turn_on() procs
2014-08-03 15:08:11 -04:00
Walter0o
0ac078ad46
derping derps
...
thanks to @mwerezak
2014-08-03 15:07:07 -04:00
ZomgPonies
ebca6c5e61
Derpyderp
2014-08-03 15:06:47 -04:00
Walter0o
570fd2756b
robot computer emagging exploit fix
...
so an emagged borg can in turn emag all others ?
the more you know.
seems extremely OP to me but i am just closing the exploit, not changing the game.
Conflicts:
code/game/machinery/computer/robot.dm
2014-08-03 15:06:16 -04:00
ZomgPonies
3facb45fa2
Derp
2014-08-03 15:05:22 -04:00
Walter0o
2a0a7db434
cyborg topic exploit fixes
...
all kinds of fun here
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2014-08-03 15:04:48 -04:00
Walter0o
6935180aee
filing cabinet exploit fix
...
hooray for teleporting atoms to you via magic office furniture
2014-08-03 15:01:10 -04:00
Walter0o
82a8f73b58
computer3 ntos topic exploit prevention
2014-08-03 15:00:56 -04:00
Walter0o
d6ddaa56c7
computer3 program topic protection
2014-08-03 15:00:40 -04:00
Walter0o
868759c93c
computer3 remote view exploit fix
...
you could look at any atom for a tick.
could need improvement, does not check camera network at the moment,
because of the costly and temporary nature of the getter proc.
2014-08-03 15:00:25 -04:00
Walter0o
63392fab2d
prisoner computer3 topic exploit fixes
...
fun : you could trigger grenades this way
2014-08-03 15:00:07 -04:00
Walter0o
d92d7fb30a
refining the clipboard topic checks
2014-08-03 14:59:53 -04:00
Walter0o
d9884f054d
paper exploit fixes
...
i think my favourite part of this was
```var/obj/item/i = usr.get_active_hand()
if( ... && usr.get_active_hand() != i))```
2014-08-03 14:59:38 -04:00
ZomgPonies
a1a866d8e4
Revert "Fixes #5202 "
...
This reverts commit a94761c5c4
2014-08-03 14:59:13 -04:00
Walter0o
fb7d02ee1f
folder exploit fixes
...
Conflicts:
code/modules/paperwork/folders.dm
2014-08-03 14:58:04 -04:00
Walter0o
3cc234cb03
clipboard exploit fixes
2014-08-03 14:57:13 -04:00
Zuhayr
a94761c5c4
Fixes #5202
2014-08-03 14:56:53 -04:00
Zuhayr
a8ae953579
Fixes #5630
...
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-08-03 14:54:45 -04:00
Zuhayr
20e6a01bb8
Fixes #5737
2014-08-03 14:53:45 -04:00
ZomgPonies
b52a1b76a6
Merge pull request #352 from VampyrBytes/master
...
Machine people fixes
2014-08-03 14:03:51 -04:00
ZomgPonies
65f099b0c9
Merge pull request #351 from Bone-White/master
...
Allows the insertion of pipework into walls
2014-08-03 14:03:42 -04:00
Bone White
0bf9f46d1f
Allows the insertion of pipework into walls
...
Pipes will be visible above the wall, allows for easier atmos repairs.
Atmos pipes installed this way can be unwrenched as normal. Walls are
unaffected.
2014-08-03 11:36:39 +01:00
ZomgPonies
cb441541f5
Added vampire HUD
2014-08-03 01:27:36 -04:00
Zuhayr
2c6c68b7aa
Adjusted gas exude code.
...
Conflicts:
code/game/machinery/hydroponics.dm
2014-08-02 22:37:05 -04:00
Zuhayr
6b51c43694
Adjusted process_reagents() so hydro trays are refillable with water and nurients when the tray is dead/empty.
2014-08-02 22:34:33 -04:00
Zuhayr
ceb7cb9419
Reapplying some fixes that I think DM may have saved over, whoops.
2014-08-02 22:34:17 -04:00
Zuhayr
23ef5530de
Changed hydro trays, fertilizer and syringes over to use the reagent procs.
...
Conflicts:
code/game/machinery/biogenerator.dm
code/modules/clothing/suits/jobs.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
maps/tgstation2.dmm
2014-08-02 22:33:47 -04:00
MrSnapwalk
75b2ca2dd2
Psychiatrist/Psychologist update.
...
Conflicts:
code/game/jobs/job/medical.dm
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-08-02 22:23:39 -04:00
PsiOmega
93898942f3
Is a little convoluted but this removes the last X: use in supermatter.dm
2014-08-02 22:12:46 -04:00
PsiOmega
db6b0dbfcc
Recasts objects to avoid usage of :
2014-08-02 22:12:29 -04:00
PsiOmega
97372a0928
Fixes #5844 by only having a supermatter explosion affect living entities on the same Z-level.
2014-08-02 22:12:19 -04:00
PsiOmega
f4be5b9afb
Fixes #5839 by making the comb slightly more gender aware.
2014-08-02 22:11:57 -04:00
ZomgPonies
ca5f2103f0
Removing the gaz stuff from botany
2014-08-02 22:09:41 -04:00
Zuhayr
41ba5f318a
More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues.
2014-08-02 22:05:10 -04:00
ZomgPonies
6e925c0e50
Merge pull request #350 from VampyrBytes/master
...
several fixes inc #233
2014-08-02 18:58:27 -04:00
VampyrBytes
b8bb0d1347
Machine people fixes
...
Disables overheating as most players reporting it makes machine people
unplayable
Fixes machine people's immunity to clone damage
Ensures machine people fall apart and consiousness transferred to
posibrain properly
Prevents robotic chest and groin being seperated which was leading to an
unrepairable body
2014-08-02 11:39:01 +01:00
PsiOmega
e9cbca8aa5
Moves robot/drone specific New()-code into their respective classes, handling it using proc-overloads.
...
Also re-arranges robot init() code to prevent a runtime error when attempting to synch photos with the Master AI.
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2014-08-01 03:52:19 -04:00
VampyrBytes
ea07c3b06b
several fixes inc #233
...
Fixes icon creation issue in certain situations such as humanising
monkeys and cloning
Fixes humanized monkeys reverting to monkey name after being used for
cloning
Fixes humanized monkeys being made as human parent object instead of
human/race
2014-08-01 06:38:01 +01:00
ZomgPonies
0aa7f2013e
Revert "Fixes #5827 "
...
This reverts commit c3caf5c403
2014-08-01 01:37:47 -04:00
Zelacks
ffacf4cc1f
Alien Icon Fixed and revamped
...
Conflicts:
code/modules/mob/living/carbon/alien/special/alien_embryo.dm
icons/mob/alien.dmi
2014-08-01 01:36:59 -04:00
Rob Nelson
61cba51494
Vending machine href exploit fix
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/vending.dm
2014-08-01 01:12:25 -04:00
PsiOmega
1b2631f86b
Adds proximity check to prevent telekinetic taping of doors.
2014-08-01 01:05:04 -04:00
JimTheCactus
fd5e0e289c
Tidy up and use more sane defaults.
2014-08-01 01:04:12 -04:00
JimTheCactus
ddf8fdc06b
Modified function such that the atom isn't used in the defaults.
...
This caused the routine to crash when the atom didn't have an icon or was null.
2014-08-01 01:03:59 -04:00
